[Pkg-gnupg-commit] [gnupg2] 235/241: Imported Upstream version 2.1.10
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Dec 9 20:32:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit 24bfccb3192f546c184bf2429ab51515cf94214c
Merge: a7a3eaf 9fadfdb
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Dec 9 12:04:26 2015 -0500
Imported Upstream version 2.1.10
ChangeLog | 1687 ++++++++++++
Makefile.am | 2 +-
Makefile.in | 4 +-
NEWS | 58 +
README | 2 +-
VERSION | 2 +-
agent/ChangeLog-2011 | 2 +-
agent/Makefile.in | 2 +
agent/cache.c | 2 +-
agent/call-pinentry.c | 4 +-
agent/call-scd.c | 2 +-
agent/command-ssh.c | 2 +-
agent/command.c | 4 +-
agent/divert-scd.c | 2 +-
agent/findkey.c | 2 +-
agent/genkey.c | 2 +-
agent/gpg-agent.c | 21 +-
agent/trustlist.c | 2 +-
autogen.sh | 1 +
build-aux/speedo/w32/inst.nsi | 3 +
common/ChangeLog-2011 | 2 +-
common/Makefile.am | 46 +-
common/Makefile.in | 305 +-
common/argparse.c | 2 +-
common/asshelp.c | 4 +-
common/asshelp.h | 1 +
common/audit.c | 2 +-
common/audit.h | 2 +-
{g13 => common}/call-gpg.c | 316 ++-
{g13 => common}/call-gpg.h | 27 +-
common/convert.c | 6 +-
common/dotlock.c | 2 +-
common/exechelp-posix.c | 2 +-
common/exechelp-w32.c | 4 +-
common/exechelp-w32ce.c | 2 +-
common/exechelp.h | 4 +-
common/helpfile.c | 2 +-
common/i18n.h | 2 +-
common/iobuf.c | 56 +-
common/iobuf.h | 12 +-
common/localename.c | 2 +-
common/logging.c | 10 +-
common/mkdir_p.c | 23 +-
common/mkdir_p.h | 4 +-
common/openpgp-oid.c | 2 +-
common/session-env.c | 2 +-
common/sexputil.c | 2 +-
common/srv.c | 333 ---
common/status-codes.h | 100 +-
common/status.h | 6 +
common/stringhelp.c | 157 +-
common/stringhelp.h | 5 +-
common/strlist.c | 19 +
common/strlist.h | 1 +
common/sysutils.c | 4 +-
common/t-sexputil.c | 2 +-
common/t-stringhelp.c | 137 +
common/{w32-afunix.h => t-strlist.c} | 73 +-
common/t-support.h | 12 +-
common/t-zb32.c | 214 +-
common/ttyio.c | 4 +-
common/userids.c | 97 +-
common/util.h | 10 +-
common/w32-afunix.h | 2 +-
common/{srv.h => zb32.h} | 44 +-
config.h.in | 9 +
configure | 662 +++--
configure.ac | 225 +-
dirmngr/Makefile.am | 40 +-
dirmngr/Makefile.in | 293 +-
dirmngr/cdblib.c | 6 +-
dirmngr/certcache.c | 4 +-
dirmngr/crlcache.c | 10 +-
dirmngr/crlfetch.c | 16 +-
dirmngr/dirmngr-client.c | 148 +-
dirmngr/dirmngr.c | 48 +-
dirmngr/dirmngr.h | 6 +-
dirmngr/dirmngr_ldap.c | 2 +-
dirmngr/dns-cert.c | 433 ---
dirmngr/dns-cert.h | 57 -
dirmngr/dns-stuff.c | 1360 +++++++++
dirmngr/dns-stuff.h | 135 +
{common => dirmngr}/http.c | 425 ++-
{common => dirmngr}/http.h | 1 +
dirmngr/ks-engine-hkp.c | 412 +--
dirmngr/ks-engine-ldap.c | 18 +-
dirmngr/ks-engine.h | 2 +-
dirmngr/ldap-wrapper.c | 2 +-
dirmngr/ldap.c | 75 +-
dirmngr/misc.c | 2 +-
dirmngr/ocsp.c | 8 +-
dirmngr/server.c | 169 +-
dirmngr/t-dns-cert.c | 93 -
dirmngr/t-dns-stuff.c | 283 ++
{common => dirmngr}/t-http.c | 9 +
{common => dirmngr}/tls-ca.pem | 0
dirmngr/validate.c | 4 +-
doc/DETAILS | 19 +
doc/HACKING | 42 +-
doc/Makefile.am | 8 +-
doc/Makefile.in | 10 +-
doc/defsincdate | 2 +-
doc/dirmngr.texi | 35 +-
doc/gnupg.info | 367 +--
doc/gnupg.info-1 | 362 ++-
doc/gnupg.info-2 | 614 +++--
doc/gnupg.texi | 3 +-
doc/gpg.texi | 131 +-
doc/gpgv.texi | 8 +
doc/tools.texi | 75 +-
doc/yat2m.c | 22 +-
g10/Makefile.am | 21 +-
g10/Makefile.in | 63 +-
g10/call-agent.c | 8 +-
g10/call-agent.h | 1 +
g10/call-dirmngr.c | 4 +-
g10/card-util.c | 6 +
g10/decrypt-data.c | 33 +-
g10/delkey.c | 4 +-
g10/dirmngr-conf.skel | 8 +
g10/encrypt.c | 6 +-
g10/export.c | 186 +-
g10/getkey.c | 198 +-
g10/gpg.c | 538 +++-
g10/gpg.h | 8 +-
g10/gpgv.c | 47 +-
g10/import.c | 50 +-
g10/keydb.c | 215 +-
g10/keydb.h | 58 +-
g10/keyedit.c | 192 +-
g10/keygen.c | 25 +-
g10/keyid.c | 153 +-
g10/keylist.c | 96 +-
g10/keyring.c | 127 +-
g10/keyring.h | 3 +-
g10/keyserver.c | 31 +-
g10/main.h | 54 +-
g10/mainproc.c | 98 +-
g10/misc.c | 79 +-
g10/options.h | 21 +-
g10/packet.h | 29 +-
g10/parse-packet.c | 2 +-
g10/pkclist.c | 40 +-
g10/pkglue.c | 2 +-
g10/plaintext.c | 138 +-
g10/pubkey-enc.c | 6 +-
g10/revoke.c | 78 +-
g10/server.c | 2 +-
g10/sig-check.c | 314 ++-
g10/sign.c | 24 +-
g10/skclist.c | 7 +-
g10/sqlite.c | 252 ++
g10/sqlite.h | 62 +
g10/t-keydb-get-keyblock.c | 62 +
g10/t-keydb-get-keyblock.gpg | Bin 0 -> 138824 bytes
g10/t-keydb.c | 4 +
g10/tdbio.c | 8 +-
g10/test-stubs.c | 40 +-
g10/tofu.c | 2912 ++++++++++++++++++++
g10/tofu.h | 114 +
g10/trust.c | 17 +-
g10/trustdb.c | 293 +-
g10/trustdb.h | 13 +-
g13/Makefile.am | 1 -
g13/Makefile.in | 8 +-
g13/create.c | 8 +-
g13/g13-common.h | 4 +
g13/g13.c | 10 +
g13/mount.c | 5 +-
g13/mountinfo.c | 2 +-
kbx/Makefile.in | 2 +
kbx/keybox-blob.c | 2 +-
kbx/keybox-file.c | 2 +-
kbx/keybox-init.c | 4 +-
kbx/keybox-search-desc.h | 2 +-
kbx/keybox-search.c | 4 +-
kbx/keybox-update.c | 4 +-
m4/Makefile.in | 2 +
po/POTFILES.in | 2 +-
po/ca.gmo | Bin 48328 -> 48328 bytes
po/ca.po | 2419 ++++++++--------
po/cs.gmo | Bin 218464 -> 217707 bytes
po/cs.po | 2440 ++++++++--------
po/da.gmo | Bin 148926 -> 148508 bytes
po/da.po | 2451 ++++++++--------
po/de.gmo | Bin 226134 -> 228439 bytes
po/de.po | 2432 ++++++++--------
po/el.gmo | Bin 48492 -> 48492 bytes
po/el.po | 2420 ++++++++--------
po/en at boldquot.gmo | Bin 206293 -> 208596 bytes
po/en at boldquot.po | 2387 ++++++++--------
po/en at quot.gmo | Bin 204117 -> 206268 bytes
po/en at quot.po | 2386 ++++++++--------
po/eo.gmo | Bin 31920 -> 31920 bytes
po/eo.po | 2418 ++++++++--------
po/es.gmo | Bin 148399 -> 147957 bytes
po/es.po | 2473 +++++++++--------
po/et.gmo | Bin 45720 -> 45720 bytes
po/et.po | 2419 ++++++++--------
po/fi.gmo | Bin 48034 -> 48034 bytes
po/fi.po | 2419 ++++++++--------
po/fr.gmo | Bin 229119 -> 228252 bytes
po/fr.po | 2447 ++++++++--------
po/gl.gmo | Bin 47537 -> 47537 bytes
po/gl.po | 2419 ++++++++--------
po/gnupg2.pot | 2370 ++++++++--------
po/hu.gmo | Bin 47434 -> 47434 bytes
po/hu.po | 2418 ++++++++--------
po/id.gmo | Bin 46149 -> 46149 bytes
po/id.po | 2419 ++++++++--------
po/it.gmo | Bin 47531 -> 47531 bytes
po/it.po | 2419 ++++++++--------
po/ja.gmo | Bin 233701 -> 233011 bytes
po/ja.po | 2458 +++++++++--------
po/nb.gmo | Bin 66055 -> 65966 bytes
po/nb.po | 2418 ++++++++--------
po/pl.gmo | Bin 151900 -> 151484 bytes
po/pl.po | 2449 ++++++++--------
po/pt.gmo | Bin 40443 -> 40443 bytes
po/pt.po | 2418 ++++++++--------
po/ro.gmo | Bin 90308 -> 90216 bytes
po/ro.po | 2428 ++++++++--------
po/ru.gmo | Bin 276722 -> 276687 bytes
po/ru.po | 2590 +++++++++--------
po/sk.gmo | Bin 46983 -> 46983 bytes
po/sk.po | 2418 ++++++++--------
po/sv.gmo | Bin 149117 -> 148708 bytes
po/sv.po | 2451 ++++++++--------
po/tr.gmo | Bin 146509 -> 146172 bytes
po/tr.po | 2447 ++++++++--------
po/uk.gmo | Bin 288290 -> 290899 bytes
po/uk.po | 2541 +++++++++--------
po/zh_CN.gmo | Bin 92097 -> 92014 bytes
po/zh_CN.po | 2429 ++++++++--------
po/zh_TW.gmo | Bin 199751 -> 199035 bytes
po/zh_TW.po | 2434 ++++++++--------
scd/Makefile.in | 2 +
scd/apdu.c | 28 +-
scd/apdu.h | 2 +-
scd/app-common.h | 5 -
scd/app-openpgp.c | 70 +-
scd/app-p15.c | 2 +-
scd/app.c | 126 +-
scd/ccid-driver.c | 35 +-
scd/ccid-driver.h | 3 +-
scd/command.c | 19 +-
scd/iso7816.c | 2 +-
scd/scdaemon.c | 11 -
sm/Makefile.in | 2 +
sm/base64.c | 4 +-
sm/call-agent.c | 4 +-
sm/call-dirmngr.c | 2 +-
sm/certchain.c | 4 +-
sm/certdump.c | 4 +-
sm/certreqgen.c | 77 +-
sm/gpgsm.c | 6 +-
sm/import.c | 2 +-
sm/keydb.c | 2 +-
sm/minip12.c | 6 +-
sm/qualified.c | 2 +-
sm/server.c | 10 +-
tests/Makefile.in | 2 +
tests/openpgp/Makefile.am | 29 +-
tests/openpgp/Makefile.in | 48 +-
tests/openpgp/conventional-mdc.test | 11 +-
tests/openpgp/gpgtar.test | 61 +
.../00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc | 17 +
.../1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc | 23 +
.../A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc | 17 +
.../ADE710D74409777B7729A7653373D820F67892E0.asc | 17 +
.../CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc | 17 +
.../E657FB607BB4F21C90BB6651BC067AF28BC90111.asc | 45 +
tests/openpgp/tofu-2183839A-1.txt | Bin 0 -> 191 bytes
tests/openpgp/tofu-BC15C85A-1.txt | 9 +
tests/openpgp/tofu-EE37CF96-1.txt | 9 +
tests/openpgp/tofu-keys-secret.asc | 95 +
tests/openpgp/tofu-keys.asc | 47 +
tests/openpgp/tofu.test | 245 ++
tests/openpgp/use-exact-key.test | 55 +
tests/openpgp/version.test | 7 +-
tests/pkits/Makefile.in | 2 +
tools/Makefile.am | 6 +-
tools/Makefile.in | 11 +-
tools/gpg-check-pattern.c | 4 +-
tools/gpg-zip.in | 10 +-
tools/gpgconf-comp.c | 8 +-
tools/gpgkey2ssh.c | 49 +-
tools/gpgparsemail.c | 2 +-
tools/gpgtar-create.c | 50 +-
tools/gpgtar-extract.c | 90 +-
tools/gpgtar-list.c | 67 +-
tools/gpgtar.c | 332 ++-
tools/gpgtar.h | 16 +-
tools/rfc822parse.c | 4 +-
tools/symcryptrun.c | 2 +-
295 files changed, 52552 insertions(+), 37261 deletions(-)
diff --cc ChangeLog
index 51ed245,8bd68a6..03ba8dc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7401 -1,16 +1,9088 @@@
-No more ChangeLog files
-========================
++2015-12-04 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.10.
+
++ 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.
+
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
++ * 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 Makefile.in
index 57358b2,0000000..3584bb2
mode 100644,000000..100644
--- a/Makefile.in
+++ b/Makefile.in
@@@ -1,1023 -1,0 +1,1025 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Makefile.am - main makefile for GnuPG
+# Copyright (C) 2001, 2004, 2010 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in $(top_srcdir)/build-aux/mkinstalldirs \
+ ABOUT-NLS $(dist_doc_DATA) COPYING COPYING.LIB THANKS TODO \
+ build-aux/compile build-aux/config.guess \
+ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+ build-aux/install-sh build-aux/mdate-sh build-aux/missing \
+ build-aux/mkinstalldirs build-aux/texinfo.tex \
+ $(top_srcdir)/build-aux/compile \
+ $(top_srcdir)/build-aux/config.guess \
+ $(top_srcdir)/build-aux/config.rpath \
+ $(top_srcdir)/build-aux/config.sub \
+ $(top_srcdir)/build-aux/install-sh \
+ $(top_srcdir)/build-aux/missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(docdir)"
+DATA = $(dist_doc_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+DIST_SUBDIRS = m4 common kbx g10 sm agent scd g13 dirmngr tools po doc \
+ tests
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
+DIST_TARGETS = dist-bzip2
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ACLOCAL_AMFLAGS = -I m4
- DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
++DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-g13
+GITLOG_TO_CHANGELOG = gitlog-to-changelog
+EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \
+ ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011 \
+ VERSION README.GIT build-aux/gitlog-to-changelog \
+ build-aux/git-log-fix build-aux/git-log-footer \
+ build-aux/getswdb.sh \
+ build-aux/speedo.mk \
+ build-aux/speedo/zlib.pc \
+ build-aux/speedo/w32/inst-options.ini \
+ build-aux/speedo/w32/inst.nsi \
+ build-aux/speedo/w32/pkg-copyright.txt \
+ build-aux/speedo/w32/g4wihelp.c \
+ build-aux/speedo/w32/pango.modules \
+ build-aux/speedo/w32/gdk-pixbuf-loaders.cache \
+ build-aux/speedo/w32/exdll.h \
+ build-aux/speedo/w32/README.txt \
+ build-aux/speedo/w32/gnupg-logo-150x57.bmp \
+ build-aux/speedo/w32/gnupg-logo-164x314.bmp \
+ build-aux/speedo/patches/atk-1.32.0.patch \
+ build-aux/speedo/patches/libiconv-1.14.patch \
+ build-aux/speedo/patches/pango-1.29.4.patch
+
+DISTCLEANFILES = g10defs.h
+ at BUILD_GPG_FALSE@gpg =
+ at BUILD_GPG_TRUE@gpg = g10
+ at BUILD_GPGSM_FALSE@sm =
+ at BUILD_GPGSM_TRUE@sm = sm
+ at BUILD_AGENT_FALSE@agent =
+ at BUILD_AGENT_TRUE@agent = agent
+ at BUILD_SCDAEMON_FALSE@scd =
+ at BUILD_SCDAEMON_TRUE@scd = scd
+ at BUILD_G13_FALSE@g13 =
+ at BUILD_G13_TRUE@g13 = g13
+ at BUILD_DIRMNGR_FALSE@dirmngr =
+ at BUILD_DIRMNGR_TRUE@dirmngr = dirmngr
+ at BUILD_TOOLS_FALSE@tools =
+ at BUILD_TOOLS_TRUE@tools = tools
+ at BUILD_DOC_FALSE@doc =
+ at BUILD_DOC_TRUE@doc = doc
+ at RUN_TESTS_FALSE@tests =
+ at RUN_TESTS_TRUE@tests = tests
+SUBDIRS = m4 common kbx \
+ ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
+ ${tools} po ${doc} ${tests}
+
+dist_doc_DATA = README
+gen_start_date = 2011-12-01T06:00:00
+all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh: Makefile
+ @:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ $(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f stamp-h1
+ touch $@
+
+distclean-hdr:
+ -rm -f config.h stamp-h1
+install-dist_docDATA: $(dist_doc_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+ done
+
+uninstall-dist_docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ test -d "$(distdir)" || mkdir "$(distdir)"
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__post_remove_distdir)
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__post_remove_distdir)
+
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+ $(am__post_remove_distdir)
+
+dist-xz: distdir
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(am__post_remove_distdir)
+
+dist-tarZ: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__post_remove_distdir)
+
+dist-shar: distdir
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__post_remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
+ $(am__post_remove_distdir)
+
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
+ chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
+ && ../configure \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
+ $(am__post_remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+ for dir in "$(DESTDIR)$(docdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ at HAVE_W32_SYSTEM_FALSE@install-data-hook:
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_docDATA
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_docDATA
+
+.MAKE: $(am__recursive_targets) all install-am install-data-am \
+ install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-data-hook \
+ install-dist_docDATA install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-dist_docDATA
+
+
+dist-hook: gen-ChangeLog
+
+ at HAVE_W32_SYSTEM_TRUE@install-data-hook:
+ at HAVE_W32_SYSTEM_TRUE@ set -e; \
+ at HAVE_W32_SYSTEM_TRUE@ for i in $$($(top_srcdir)/build-aux/potomo \
+ at HAVE_W32_SYSTEM_TRUE@ --get-linguas $(top_srcdir)/po) ; do \
+ at HAVE_W32_SYSTEM_TRUE@ $(MKDIR_P) "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES" || true; \
+ at HAVE_W32_SYSTEM_TRUE@ rm -f "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" \
+ at HAVE_W32_SYSTEM_TRUE@ 2>/dev/null || true; \
+ at HAVE_W32_SYSTEM_TRUE@ $(top_srcdir)/build-aux/potomo $(top_srcdir)/po/$$i.po \
+ at HAVE_W32_SYSTEM_TRUE@ "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" ; \
+ at HAVE_W32_SYSTEM_TRUE@ done
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+ if test -d $(top_srcdir)/.git; then \
+ (cd $(top_srcdir) && \
+ $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
+ --amend=build-aux/git-log-fix \
+ --since=$(gen_start_date) ) > $(distdir)/cl-t; \
+ cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t; \
+ rm -f $(distdir)/ChangeLog; \
+ mv $(distdir)/cl-t $(distdir)/ChangeLog; \
+ fi
+
+stowinstall:
+ $(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/gnupg
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc VERSION
index 63a1a1c,0000000..8dbb0f2
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.1.9
++2.1.10
diff --cc agent/Makefile.in
index aba2d32,0000000..375a4d3
mode 100644,000000..100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@@ -1,1285 -1,0 +1,1287 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = gpg-agent$(EXEEXT)
+libexec_PROGRAMS = gpg-protect-tool$(EXEEXT) $(am__EXEEXT_1)
+# fixme: Do no use simple-pwquery for preset-passphrase.
+ at HAVE_W32CE_SYSTEM_FALSE@am__append_1 = gpg-preset-passphrase
+noinst_PROGRAMS = $(am__EXEEXT_2)
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(top_srcdir)/build-aux/depcomp
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_2 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_8 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+ at HAVE_W32_SYSTEM_TRUE@am__append_9 = gpg-agent-w32info.o
+TESTS = t-protect$(EXEEXT)
+subdir = agent
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"
+ at HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_1 = \
+ at HAVE_W32CE_SYSTEM_FALSE@ gpg-preset-passphrase$(EXEEXT)
+am__EXEEXT_2 = t-protect$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+am_gpg_agent_OBJECTS = gpg_agent-gpg-agent.$(OBJEXT) \
+ gpg_agent-command.$(OBJEXT) gpg_agent-command-ssh.$(OBJEXT) \
+ gpg_agent-call-pinentry.$(OBJEXT) gpg_agent-cache.$(OBJEXT) \
+ gpg_agent-trans.$(OBJEXT) gpg_agent-findkey.$(OBJEXT) \
+ gpg_agent-pksign.$(OBJEXT) gpg_agent-pkdecrypt.$(OBJEXT) \
+ gpg_agent-genkey.$(OBJEXT) gpg_agent-protect.$(OBJEXT) \
+ gpg_agent-trustlist.$(OBJEXT) gpg_agent-divert-scd.$(OBJEXT) \
+ gpg_agent-cvt-openpgp.$(OBJEXT) gpg_agent-call-scd.$(OBJEXT) \
+ gpg_agent-learncard.$(OBJEXT)
+gpg_agent_OBJECTS = $(am_gpg_agent_OBJECTS)
+am__DEPENDENCIES_1 =
+gpg_agent_LINK = $(CCLD) $(gpg_agent_CFLAGS) $(CFLAGS) \
+ $(gpg_agent_LDFLAGS) $(LDFLAGS) -o $@
+am_gpg_preset_passphrase_OBJECTS = preset-passphrase.$(OBJEXT)
+gpg_preset_passphrase_OBJECTS = $(am_gpg_preset_passphrase_OBJECTS)
+ at HAVE_W32CE_SYSTEM_FALSE@am__DEPENDENCIES_2 = \
+ at HAVE_W32CE_SYSTEM_FALSE@ ../common/libsimple-pwquery.a
+gpg_preset_passphrase_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+ $(common_libs) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+am_gpg_protect_tool_OBJECTS = gpg_protect_tool-protect-tool.$(OBJEXT) \
+ gpg_protect_tool-protect.$(OBJEXT)
+gpg_protect_tool_OBJECTS = $(am_gpg_protect_tool_OBJECTS)
+gpg_protect_tool_DEPENDENCIES = $(common_libs) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+gpg_protect_tool_LINK = $(CCLD) $(gpg_protect_tool_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_t_protect_OBJECTS = t-protect.$(OBJEXT) protect.$(OBJEXT)
+t_protect_OBJECTS = $(am_t_protect_OBJECTS)
+am__DEPENDENCIES_3 = $(common_libs) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+t_protect_DEPENDENCIES = $(am__DEPENDENCIES_3)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(gpg_agent_SOURCES) $(gpg_preset_passphrase_SOURCES) \
+ $(gpg_protect_tool_SOURCES) $(t_protect_SOURCES)
+DIST_SOURCES = $(gpg_agent_SOURCES) $(gpg_preset_passphrase_SOURCES) \
+ $(gpg_protect_tool_SOURCES) $(t_protect_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
+ $(am__append_2) $(am__append_3) $(am__append_4) \
+ $(am__append_5) $(am__append_6) $(am__append_7) \
+ $(am__append_8)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs = $(am__append_9)
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
+gpg_agent_SOURCES = \
+ gpg-agent.c agent.h \
+ command.c command-ssh.c \
+ call-pinentry.c \
+ cache.c \
+ trans.c \
+ findkey.c \
+ pksign.c \
+ pkdecrypt.c \
+ genkey.c \
+ protect.c \
+ trustlist.c \
+ divert-scd.c \
+ cvt-openpgp.c cvt-openpgp.h \
+ call-scd.c \
+ learncard.c
+
+common_libs = $(libcommon)
+commonpth_libs = $(libcommonpth)
+ at HAVE_W32CE_SYSTEM_FALSE@pwquery_libs = ../common/libsimple-pwquery.a
+ at HAVE_W32CE_SYSTEM_TRUE@pwquery_libs =
+gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
+gpg_agent_LDADD = $(commonpth_libs) \
+ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
+ $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
+ $(resource_objs)
+
+gpg_agent_LDFLAGS = $(extra_bin_ldflags)
+gpg_agent_DEPENDENCIES = $(resource_objs)
+gpg_protect_tool_SOURCES = \
+ protect-tool.c \
+ protect.c
+
+gpg_protect_tool_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
+gpg_protect_tool_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) \
+ $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
+
+gpg_preset_passphrase_SOURCES = \
+ preset-passphrase.c
+
+
+# Needs $(NETLIBS) for libsimple-pwquery.la.
+gpg_preset_passphrase_LDADD = \
+ $(pwquery_libs) $(common_libs) \
+ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
+
+t_common_ldadd = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+ $(LIBINTL) $(LIBICONV) $(NETLIBS)
+
+t_protect_SOURCES = t-protect.c protect.c
+t_protect_LDADD = $(t_common_ldadd)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu agent/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu agent/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-libexecPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+
+clean-libexecPROGRAMS:
+ -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+
+clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+gpg-agent$(EXEEXT): $(gpg_agent_OBJECTS) $(gpg_agent_DEPENDENCIES) $(EXTRA_gpg_agent_DEPENDENCIES)
+ @rm -f gpg-agent$(EXEEXT)
+ $(AM_V_CCLD)$(gpg_agent_LINK) $(gpg_agent_OBJECTS) $(gpg_agent_LDADD) $(LIBS)
+
+gpg-preset-passphrase$(EXEEXT): $(gpg_preset_passphrase_OBJECTS) $(gpg_preset_passphrase_DEPENDENCIES) $(EXTRA_gpg_preset_passphrase_DEPENDENCIES)
+ @rm -f gpg-preset-passphrase$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gpg_preset_passphrase_OBJECTS) $(gpg_preset_passphrase_LDADD) $(LIBS)
+
+gpg-protect-tool$(EXEEXT): $(gpg_protect_tool_OBJECTS) $(gpg_protect_tool_DEPENDENCIES) $(EXTRA_gpg_protect_tool_DEPENDENCIES)
+ @rm -f gpg-protect-tool$(EXEEXT)
+ $(AM_V_CCLD)$(gpg_protect_tool_LINK) $(gpg_protect_tool_OBJECTS) $(gpg_protect_tool_LDADD) $(LIBS)
+
+t-protect$(EXEEXT): $(t_protect_OBJECTS) $(t_protect_DEPENDENCIES) $(EXTRA_t_protect_DEPENDENCIES)
+ @rm -f t-protect$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_protect_OBJECTS) $(t_protect_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-cache.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-call-pinentry.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-call-scd.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-command-ssh.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-command.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-cvt-openpgp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-divert-scd.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-findkey.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-genkey.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-gpg-agent.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-learncard.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-pkdecrypt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-pksign.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-protect.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-trans.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_agent-trustlist.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_protect_tool-protect-tool.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_protect_tool-protect.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/preset-passphrase.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/protect.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-protect.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+gpg_agent-gpg-agent.o: gpg-agent.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-gpg-agent.o -MD -MP -MF $(DEPDIR)/gpg_agent-gpg-agent.Tpo -c -o gpg_agent-gpg-agent.o `test -f 'gpg-agent.c' || echo '$(srcdir)/'`gpg-agent.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-gpg-agent.Tpo $(DEPDIR)/gpg_agent-gpg-agent.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpg-agent.c' object='gpg_agent-gpg-agent.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-gpg-agent.o `test -f 'gpg-agent.c' || echo '$(srcdir)/'`gpg-agent.c
+
+gpg_agent-gpg-agent.obj: gpg-agent.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-gpg-agent.obj -MD -MP -MF $(DEPDIR)/gpg_agent-gpg-agent.Tpo -c -o gpg_agent-gpg-agent.obj `if test -f 'gpg-agent.c'; then $(CYGPATH_W) 'gpg-agent.c'; else $(CYGPATH_W) '$(srcdir)/gpg-agent.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-gpg-agent.Tpo $(DEPDIR)/gpg_agent-gpg-agent.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpg-agent.c' object='gpg_agent-gpg-agent.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-gpg-agent.obj `if test -f 'gpg-agent.c'; then $(CYGPATH_W) 'gpg-agent.c'; else $(CYGPATH_W) '$(srcdir)/gpg-agent.c'; fi`
+
+gpg_agent-command.o: command.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-command.o -MD -MP -MF $(DEPDIR)/gpg_agent-command.Tpo -c -o gpg_agent-command.o `test -f 'command.c' || echo '$(srcdir)/'`command.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-command.Tpo $(DEPDIR)/gpg_agent-command.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command.c' object='gpg_agent-command.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-command.o `test -f 'command.c' || echo '$(srcdir)/'`command.c
+
+gpg_agent-command.obj: command.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-command.obj -MD -MP -MF $(DEPDIR)/gpg_agent-command.Tpo -c -o gpg_agent-command.obj `if test -f 'command.c'; then $(CYGPATH_W) 'command.c'; else $(CYGPATH_W) '$(srcdir)/command.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-command.Tpo $(DEPDIR)/gpg_agent-command.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command.c' object='gpg_agent-command.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-command.obj `if test -f 'command.c'; then $(CYGPATH_W) 'command.c'; else $(CYGPATH_W) '$(srcdir)/command.c'; fi`
+
+gpg_agent-command-ssh.o: command-ssh.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-command-ssh.o -MD -MP -MF $(DEPDIR)/gpg_agent-command-ssh.Tpo -c -o gpg_agent-command-ssh.o `test -f 'command-ssh.c' || echo '$(srcdir)/'`command-ssh.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-command-ssh.Tpo $(DEPDIR)/gpg_agent-command-ssh.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-ssh.c' object='gpg_agent-command-ssh.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-command-ssh.o `test -f 'command-ssh.c' || echo '$(srcdir)/'`command-ssh.c
+
+gpg_agent-command-ssh.obj: command-ssh.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-command-ssh.obj -MD -MP -MF $(DEPDIR)/gpg_agent-command-ssh.Tpo -c -o gpg_agent-command-ssh.obj `if test -f 'command-ssh.c'; then $(CYGPATH_W) 'command-ssh.c'; else $(CYGPATH_W) '$(srcdir)/command-ssh.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-command-ssh.Tpo $(DEPDIR)/gpg_agent-command-ssh.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-ssh.c' object='gpg_agent-command-ssh.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-command-ssh.obj `if test -f 'command-ssh.c'; then $(CYGPATH_W) 'command-ssh.c'; else $(CYGPATH_W) '$(srcdir)/command-ssh.c'; fi`
+
+gpg_agent-call-pinentry.o: call-pinentry.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-call-pinentry.o -MD -MP -MF $(DEPDIR)/gpg_agent-call-pinentry.Tpo -c -o gpg_agent-call-pinentry.o `test -f 'call-pinentry.c' || echo '$(srcdir)/'`call-pinentry.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-call-pinentry.Tpo $(DEPDIR)/gpg_agent-call-pinentry.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='call-pinentry.c' object='gpg_agent-call-pinentry.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-call-pinentry.o `test -f 'call-pinentry.c' || echo '$(srcdir)/'`call-pinentry.c
+
+gpg_agent-call-pinentry.obj: call-pinentry.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-call-pinentry.obj -MD -MP -MF $(DEPDIR)/gpg_agent-call-pinentry.Tpo -c -o gpg_agent-call-pinentry.obj `if test -f 'call-pinentry.c'; then $(CYGPATH_W) 'call-pinentry.c'; else $(CYGPATH_W) '$(srcdir)/call-pinentry.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-call-pinentry.Tpo $(DEPDIR)/gpg_agent-call-pinentry.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='call-pinentry.c' object='gpg_agent-call-pinentry.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-call-pinentry.obj `if test -f 'call-pinentry.c'; then $(CYGPATH_W) 'call-pinentry.c'; else $(CYGPATH_W) '$(srcdir)/call-pinentry.c'; fi`
+
+gpg_agent-cache.o: cache.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-cache.o -MD -MP -MF $(DEPDIR)/gpg_agent-cache.Tpo -c -o gpg_agent-cache.o `test -f 'cache.c' || echo '$(srcdir)/'`cache.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-cache.Tpo $(DEPDIR)/gpg_agent-cache.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cache.c' object='gpg_agent-cache.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-cache.o `test -f 'cache.c' || echo '$(srcdir)/'`cache.c
+
+gpg_agent-cache.obj: cache.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-cache.obj -MD -MP -MF $(DEPDIR)/gpg_agent-cache.Tpo -c -o gpg_agent-cache.obj `if test -f 'cache.c'; then $(CYGPATH_W) 'cache.c'; else $(CYGPATH_W) '$(srcdir)/cache.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-cache.Tpo $(DEPDIR)/gpg_agent-cache.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cache.c' object='gpg_agent-cache.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-cache.obj `if test -f 'cache.c'; then $(CYGPATH_W) 'cache.c'; else $(CYGPATH_W) '$(srcdir)/cache.c'; fi`
+
+gpg_agent-trans.o: trans.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-trans.o -MD -MP -MF $(DEPDIR)/gpg_agent-trans.Tpo -c -o gpg_agent-trans.o `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-trans.Tpo $(DEPDIR)/gpg_agent-trans.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trans.c' object='gpg_agent-trans.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-trans.o `test -f 'trans.c' || echo '$(srcdir)/'`trans.c
+
+gpg_agent-trans.obj: trans.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-trans.obj -MD -MP -MF $(DEPDIR)/gpg_agent-trans.Tpo -c -o gpg_agent-trans.obj `if test -f 'trans.c'; then $(CYGPATH_W) 'trans.c'; else $(CYGPATH_W) '$(srcdir)/trans.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-trans.Tpo $(DEPDIR)/gpg_agent-trans.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trans.c' object='gpg_agent-trans.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-trans.obj `if test -f 'trans.c'; then $(CYGPATH_W) 'trans.c'; else $(CYGPATH_W) '$(srcdir)/trans.c'; fi`
+
+gpg_agent-findkey.o: findkey.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-findkey.o -MD -MP -MF $(DEPDIR)/gpg_agent-findkey.Tpo -c -o gpg_agent-findkey.o `test -f 'findkey.c' || echo '$(srcdir)/'`findkey.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-findkey.Tpo $(DEPDIR)/gpg_agent-findkey.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='findkey.c' object='gpg_agent-findkey.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-findkey.o `test -f 'findkey.c' || echo '$(srcdir)/'`findkey.c
+
+gpg_agent-findkey.obj: findkey.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-findkey.obj -MD -MP -MF $(DEPDIR)/gpg_agent-findkey.Tpo -c -o gpg_agent-findkey.obj `if test -f 'findkey.c'; then $(CYGPATH_W) 'findkey.c'; else $(CYGPATH_W) '$(srcdir)/findkey.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-findkey.Tpo $(DEPDIR)/gpg_agent-findkey.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='findkey.c' object='gpg_agent-findkey.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-findkey.obj `if test -f 'findkey.c'; then $(CYGPATH_W) 'findkey.c'; else $(CYGPATH_W) '$(srcdir)/findkey.c'; fi`
+
+gpg_agent-pksign.o: pksign.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-pksign.o -MD -MP -MF $(DEPDIR)/gpg_agent-pksign.Tpo -c -o gpg_agent-pksign.o `test -f 'pksign.c' || echo '$(srcdir)/'`pksign.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-pksign.Tpo $(DEPDIR)/gpg_agent-pksign.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pksign.c' object='gpg_agent-pksign.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-pksign.o `test -f 'pksign.c' || echo '$(srcdir)/'`pksign.c
+
+gpg_agent-pksign.obj: pksign.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-pksign.obj -MD -MP -MF $(DEPDIR)/gpg_agent-pksign.Tpo -c -o gpg_agent-pksign.obj `if test -f 'pksign.c'; then $(CYGPATH_W) 'pksign.c'; else $(CYGPATH_W) '$(srcdir)/pksign.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-pksign.Tpo $(DEPDIR)/gpg_agent-pksign.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pksign.c' object='gpg_agent-pksign.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-pksign.obj `if test -f 'pksign.c'; then $(CYGPATH_W) 'pksign.c'; else $(CYGPATH_W) '$(srcdir)/pksign.c'; fi`
+
+gpg_agent-pkdecrypt.o: pkdecrypt.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-pkdecrypt.o -MD -MP -MF $(DEPDIR)/gpg_agent-pkdecrypt.Tpo -c -o gpg_agent-pkdecrypt.o `test -f 'pkdecrypt.c' || echo '$(srcdir)/'`pkdecrypt.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-pkdecrypt.Tpo $(DEPDIR)/gpg_agent-pkdecrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pkdecrypt.c' object='gpg_agent-pkdecrypt.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-pkdecrypt.o `test -f 'pkdecrypt.c' || echo '$(srcdir)/'`pkdecrypt.c
+
+gpg_agent-pkdecrypt.obj: pkdecrypt.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-pkdecrypt.obj -MD -MP -MF $(DEPDIR)/gpg_agent-pkdecrypt.Tpo -c -o gpg_agent-pkdecrypt.obj `if test -f 'pkdecrypt.c'; then $(CYGPATH_W) 'pkdecrypt.c'; else $(CYGPATH_W) '$(srcdir)/pkdecrypt.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-pkdecrypt.Tpo $(DEPDIR)/gpg_agent-pkdecrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pkdecrypt.c' object='gpg_agent-pkdecrypt.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-pkdecrypt.obj `if test -f 'pkdecrypt.c'; then $(CYGPATH_W) 'pkdecrypt.c'; else $(CYGPATH_W) '$(srcdir)/pkdecrypt.c'; fi`
+
+gpg_agent-genkey.o: genkey.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-genkey.o -MD -MP -MF $(DEPDIR)/gpg_agent-genkey.Tpo -c -o gpg_agent-genkey.o `test -f 'genkey.c' || echo '$(srcdir)/'`genkey.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-genkey.Tpo $(DEPDIR)/gpg_agent-genkey.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='genkey.c' object='gpg_agent-genkey.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-genkey.o `test -f 'genkey.c' || echo '$(srcdir)/'`genkey.c
+
+gpg_agent-genkey.obj: genkey.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-genkey.obj -MD -MP -MF $(DEPDIR)/gpg_agent-genkey.Tpo -c -o gpg_agent-genkey.obj `if test -f 'genkey.c'; then $(CYGPATH_W) 'genkey.c'; else $(CYGPATH_W) '$(srcdir)/genkey.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-genkey.Tpo $(DEPDIR)/gpg_agent-genkey.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='genkey.c' object='gpg_agent-genkey.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-genkey.obj `if test -f 'genkey.c'; then $(CYGPATH_W) 'genkey.c'; else $(CYGPATH_W) '$(srcdir)/genkey.c'; fi`
+
+gpg_agent-protect.o: protect.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-protect.o -MD -MP -MF $(DEPDIR)/gpg_agent-protect.Tpo -c -o gpg_agent-protect.o `test -f 'protect.c' || echo '$(srcdir)/'`protect.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-protect.Tpo $(DEPDIR)/gpg_agent-protect.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='protect.c' object='gpg_agent-protect.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-protect.o `test -f 'protect.c' || echo '$(srcdir)/'`protect.c
+
+gpg_agent-protect.obj: protect.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-protect.obj -MD -MP -MF $(DEPDIR)/gpg_agent-protect.Tpo -c -o gpg_agent-protect.obj `if test -f 'protect.c'; then $(CYGPATH_W) 'protect.c'; else $(CYGPATH_W) '$(srcdir)/protect.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-protect.Tpo $(DEPDIR)/gpg_agent-protect.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='protect.c' object='gpg_agent-protect.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-protect.obj `if test -f 'protect.c'; then $(CYGPATH_W) 'protect.c'; else $(CYGPATH_W) '$(srcdir)/protect.c'; fi`
+
+gpg_agent-trustlist.o: trustlist.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-trustlist.o -MD -MP -MF $(DEPDIR)/gpg_agent-trustlist.Tpo -c -o gpg_agent-trustlist.o `test -f 'trustlist.c' || echo '$(srcdir)/'`trustlist.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-trustlist.Tpo $(DEPDIR)/gpg_agent-trustlist.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trustlist.c' object='gpg_agent-trustlist.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-trustlist.o `test -f 'trustlist.c' || echo '$(srcdir)/'`trustlist.c
+
+gpg_agent-trustlist.obj: trustlist.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-trustlist.obj -MD -MP -MF $(DEPDIR)/gpg_agent-trustlist.Tpo -c -o gpg_agent-trustlist.obj `if test -f 'trustlist.c'; then $(CYGPATH_W) 'trustlist.c'; else $(CYGPATH_W) '$(srcdir)/trustlist.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-trustlist.Tpo $(DEPDIR)/gpg_agent-trustlist.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trustlist.c' object='gpg_agent-trustlist.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-trustlist.obj `if test -f 'trustlist.c'; then $(CYGPATH_W) 'trustlist.c'; else $(CYGPATH_W) '$(srcdir)/trustlist.c'; fi`
+
+gpg_agent-divert-scd.o: divert-scd.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-divert-scd.o -MD -MP -MF $(DEPDIR)/gpg_agent-divert-scd.Tpo -c -o gpg_agent-divert-scd.o `test -f 'divert-scd.c' || echo '$(srcdir)/'`divert-scd.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-divert-scd.Tpo $(DEPDIR)/gpg_agent-divert-scd.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='divert-scd.c' object='gpg_agent-divert-scd.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-divert-scd.o `test -f 'divert-scd.c' || echo '$(srcdir)/'`divert-scd.c
+
+gpg_agent-divert-scd.obj: divert-scd.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-divert-scd.obj -MD -MP -MF $(DEPDIR)/gpg_agent-divert-scd.Tpo -c -o gpg_agent-divert-scd.obj `if test -f 'divert-scd.c'; then $(CYGPATH_W) 'divert-scd.c'; else $(CYGPATH_W) '$(srcdir)/divert-scd.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-divert-scd.Tpo $(DEPDIR)/gpg_agent-divert-scd.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='divert-scd.c' object='gpg_agent-divert-scd.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-divert-scd.obj `if test -f 'divert-scd.c'; then $(CYGPATH_W) 'divert-scd.c'; else $(CYGPATH_W) '$(srcdir)/divert-scd.c'; fi`
+
+gpg_agent-cvt-openpgp.o: cvt-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-cvt-openpgp.o -MD -MP -MF $(DEPDIR)/gpg_agent-cvt-openpgp.Tpo -c -o gpg_agent-cvt-openpgp.o `test -f 'cvt-openpgp.c' || echo '$(srcdir)/'`cvt-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-cvt-openpgp.Tpo $(DEPDIR)/gpg_agent-cvt-openpgp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cvt-openpgp.c' object='gpg_agent-cvt-openpgp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-cvt-openpgp.o `test -f 'cvt-openpgp.c' || echo '$(srcdir)/'`cvt-openpgp.c
+
+gpg_agent-cvt-openpgp.obj: cvt-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-cvt-openpgp.obj -MD -MP -MF $(DEPDIR)/gpg_agent-cvt-openpgp.Tpo -c -o gpg_agent-cvt-openpgp.obj `if test -f 'cvt-openpgp.c'; then $(CYGPATH_W) 'cvt-openpgp.c'; else $(CYGPATH_W) '$(srcdir)/cvt-openpgp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-cvt-openpgp.Tpo $(DEPDIR)/gpg_agent-cvt-openpgp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cvt-openpgp.c' object='gpg_agent-cvt-openpgp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-cvt-openpgp.obj `if test -f 'cvt-openpgp.c'; then $(CYGPATH_W) 'cvt-openpgp.c'; else $(CYGPATH_W) '$(srcdir)/cvt-openpgp.c'; fi`
+
+gpg_agent-call-scd.o: call-scd.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-call-scd.o -MD -MP -MF $(DEPDIR)/gpg_agent-call-scd.Tpo -c -o gpg_agent-call-scd.o `test -f 'call-scd.c' || echo '$(srcdir)/'`call-scd.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-call-scd.Tpo $(DEPDIR)/gpg_agent-call-scd.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='call-scd.c' object='gpg_agent-call-scd.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-call-scd.o `test -f 'call-scd.c' || echo '$(srcdir)/'`call-scd.c
+
+gpg_agent-call-scd.obj: call-scd.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-call-scd.obj -MD -MP -MF $(DEPDIR)/gpg_agent-call-scd.Tpo -c -o gpg_agent-call-scd.obj `if test -f 'call-scd.c'; then $(CYGPATH_W) 'call-scd.c'; else $(CYGPATH_W) '$(srcdir)/call-scd.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-call-scd.Tpo $(DEPDIR)/gpg_agent-call-scd.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='call-scd.c' object='gpg_agent-call-scd.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-call-scd.obj `if test -f 'call-scd.c'; then $(CYGPATH_W) 'call-scd.c'; else $(CYGPATH_W) '$(srcdir)/call-scd.c'; fi`
+
+gpg_agent-learncard.o: learncard.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-learncard.o -MD -MP -MF $(DEPDIR)/gpg_agent-learncard.Tpo -c -o gpg_agent-learncard.o `test -f 'learncard.c' || echo '$(srcdir)/'`learncard.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-learncard.Tpo $(DEPDIR)/gpg_agent-learncard.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='learncard.c' object='gpg_agent-learncard.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-learncard.o `test -f 'learncard.c' || echo '$(srcdir)/'`learncard.c
+
+gpg_agent-learncard.obj: learncard.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -MT gpg_agent-learncard.obj -MD -MP -MF $(DEPDIR)/gpg_agent-learncard.Tpo -c -o gpg_agent-learncard.obj `if test -f 'learncard.c'; then $(CYGPATH_W) 'learncard.c'; else $(CYGPATH_W) '$(srcdir)/learncard.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_agent-learncard.Tpo $(DEPDIR)/gpg_agent-learncard.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='learncard.c' object='gpg_agent-learncard.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_agent_CFLAGS) $(CFLAGS) -c -o gpg_agent-learncard.obj `if test -f 'learncard.c'; then $(CYGPATH_W) 'learncard.c'; else $(CYGPATH_W) '$(srcdir)/learncard.c'; fi`
+
+gpg_protect_tool-protect-tool.o: protect-tool.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_protect_tool_CFLAGS) $(CFLAGS) -MT gpg_protect_tool-protect-tool.o -MD -MP -MF $(DEPDIR)/gpg_protect_tool-protect-tool.Tpo -c -o gpg_protect_tool-protect-tool.o `test -f 'protect-tool.c' || echo '$(srcdir)/'`protect-tool.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_protect_tool-protect-tool.Tpo $(DEPDIR)/gpg_protect_tool-protect-tool.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='protect-tool.c' object='gpg_protect_tool-protect-tool.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_protect_tool_CFLAGS) $(CFLAGS) -c -o gpg_protect_tool-protect-tool.o `test -f 'protect-tool.c' || echo '$(srcdir)/'`protect-tool.c
+
+gpg_protect_tool-protect-tool.obj: protect-tool.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_protect_tool_CFLAGS) $(CFLAGS) -MT gpg_protect_tool-protect-tool.obj -MD -MP -MF $(DEPDIR)/gpg_protect_tool-protect-tool.Tpo -c -o gpg_protect_tool-protect-tool.obj `if test -f 'protect-tool.c'; then $(CYGPATH_W) 'protect-tool.c'; else $(CYGPATH_W) '$(srcdir)/protect-tool.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_protect_tool-protect-tool.Tpo $(DEPDIR)/gpg_protect_tool-protect-tool.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='protect-tool.c' object='gpg_protect_tool-protect-tool.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_protect_tool_CFLAGS) $(CFLAGS) -c -o gpg_protect_tool-protect-tool.obj `if test -f 'protect-tool.c'; then $(CYGPATH_W) 'protect-tool.c'; else $(CYGPATH_W) '$(srcdir)/protect-tool.c'; fi`
+
+gpg_protect_tool-protect.o: protect.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_protect_tool_CFLAGS) $(CFLAGS) -MT gpg_protect_tool-protect.o -MD -MP -MF $(DEPDIR)/gpg_protect_tool-protect.Tpo -c -o gpg_protect_tool-protect.o `test -f 'protect.c' || echo '$(srcdir)/'`protect.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_protect_tool-protect.Tpo $(DEPDIR)/gpg_protect_tool-protect.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='protect.c' object='gpg_protect_tool-protect.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_protect_tool_CFLAGS) $(CFLAGS) -c -o gpg_protect_tool-protect.o `test -f 'protect.c' || echo '$(srcdir)/'`protect.c
+
+gpg_protect_tool-protect.obj: protect.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_protect_tool_CFLAGS) $(CFLAGS) -MT gpg_protect_tool-protect.obj -MD -MP -MF $(DEPDIR)/gpg_protect_tool-protect.Tpo -c -o gpg_protect_tool-protect.obj `if test -f 'protect.c'; then $(CYGPATH_W) 'protect.c'; else $(CYGPATH_W) '$(srcdir)/protect.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_protect_tool-protect.Tpo $(DEPDIR)/gpg_protect_tool-protect.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='protect.c' object='gpg_protect_tool-protect.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_protect_tool_CFLAGS) $(CFLAGS) -c -o gpg_protect_tool-protect.obj `if test -f 'protect.c'; then $(CYGPATH_W) 'protect.c'; else $(CYGPATH_W) '$(srcdir)/protect.c'; fi`
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ col=$$blu; res=SKIP; \
+ fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
+ All=""; \
+ else \
+ tests="tests"; \
+ All="All "; \
+ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="$$All$$all $$tests passed"; \
+ else \
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all $$tests failed"; \
+ else \
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+ clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-libexecPROGRAMS
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+# Make sure that all libs are build before we use them. This is
+# important for things like make -j2.
+$(PROGRAMS): $(common_libs) $(commonpth_libs) $(pwquery_libs)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc common/Makefile.in
index 6860eee,0000000..8532da6
mode 100644,000000..100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@@ -1,2816 -1,0 +1,2733 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Makefile for common gnupg modules
+# Copyright (C) 2001, 2003, 2007, 2010 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+ at HAVE_W32CE_SYSTEM_FALSE@am__append_1 = libsimple-pwquery.a
+noinst_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
+TESTS = $(am__EXEEXT_3)
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(srcdir)/w32info-rc.h.in $(top_srcdir)/build-aux/depcomp \
+ README
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_2 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_8 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+ at HAVE_W32_SYSTEM_TRUE@am__append_9 = w32-reg.c w32-afunix.c w32-afunix.h
+
+# To make the code easier to read we have split home some code into
+# separate source files.
+ at HAVE_W32CE_SYSTEM_TRUE@@HAVE_W32_SYSTEM_TRUE at am__append_10 = exechelp-w32ce.c
+ at HAVE_W32CE_SYSTEM_FALSE@@HAVE_W32_SYSTEM_TRUE at am__append_11 = exechelp-w32.c
+ at HAVE_W32_SYSTEM_FALSE@am__append_12 = exechelp-posix.c
- @USE_DNS_SRV_TRUE at am__append_13 = srv.c
- @USE_DNS_SRV_TRUE at am__append_14 = srv.c
- @HAVE_W32CE_SYSTEM_FALSE at am__append_15 = t-exechelp
- @HAVE_W32_SYSTEM_TRUE at am__append_16 = t-w32-reg
++ at HAVE_W32CE_SYSTEM_FALSE@am__append_13 = t-exechelp
++ at HAVE_W32_SYSTEM_TRUE@am__append_14 = t-w32-reg
+subdir = common
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = w32info-rc.h
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_ at AM_V@)
+am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
+am__v_AR_0 = @echo " AR " $@;
+am__v_AR_1 =
+libcommon_a_AR = $(AR) $(ARFLAGS)
+libcommon_a_LIBADD =
+am__libcommon_a_SOURCES_DIST = common-defs.h util.h i18n.c i18n.h \
+ types.h host2net.h dynload.h w32help.h mapstrings.c \
+ stringhelp.c stringhelp.h strlist.c strlist.h utf8conv.c \
+ utf8conv.h argparse.c argparse.h logging.c logging.h dotlock.c \
+ dotlock.h mischelp.c mischelp.h status.c status.h shareddefs.h \
+ openpgpdefs.h gc-opt-flags.h keyserver.h sexp-parse.h tlv.c \
+ tlv.h init.c init.h sexputil.c sysutils.c sysutils.h homedir.c \
- gettime.c gettime.h yesno.c b64enc.c b64dec.c zb32.c convert.c \
- percent.c mbox-util.c mbox-util.h miscellaneous.c xasprintf.c \
- xreadline.c membuf.c membuf.h iobuf.c iobuf.h ttyio.c ttyio.h \
- asshelp.c asshelp2.c asshelp.h exechelp.h signal.c audit.c \
- audit.h srv.h localename.c session-env.c session-env.h \
- userids.c userids.h openpgp-oid.c ssh-utils.c ssh-utils.h \
- agent-opt.c helpfile.c mkdir_p.c mkdir_p.h w32-reg.c \
- w32-afunix.c w32-afunix.h exechelp-w32ce.c exechelp-w32.c \
- exechelp-posix.c get-passphrase.c get-passphrase.h srv.c
++ gettime.c gettime.h yesno.c b64enc.c b64dec.c zb32.c zb32.h \
++ convert.c percent.c mbox-util.c mbox-util.h miscellaneous.c \
++ xasprintf.c xreadline.c membuf.c membuf.h iobuf.c iobuf.h \
++ ttyio.c ttyio.h asshelp.c asshelp2.c asshelp.h exechelp.h \
++ signal.c audit.c audit.h localename.c session-env.c \
++ session-env.h userids.c userids.h openpgp-oid.c ssh-utils.c \
++ ssh-utils.h agent-opt.c helpfile.c mkdir_p.c mkdir_p.h \
++ call-gpg.c call-gpg.h w32-reg.c w32-afunix.c w32-afunix.h \
++ exechelp-w32ce.c exechelp-w32.c exechelp-posix.c \
++ get-passphrase.c get-passphrase.h
+ at HAVE_W32_SYSTEM_TRUE@am__objects_1 = libcommon_a-w32-reg.$(OBJEXT) \
+ at HAVE_W32_SYSTEM_TRUE@ libcommon_a-w32-afunix.$(OBJEXT)
+ at HAVE_W32CE_SYSTEM_TRUE@@HAVE_W32_SYSTEM_TRUE at am__objects_2 = libcommon_a-exechelp-w32ce.$(OBJEXT)
+ at HAVE_W32CE_SYSTEM_FALSE@@HAVE_W32_SYSTEM_TRUE at am__objects_3 = libcommon_a-exechelp-w32.$(OBJEXT)
+ at HAVE_W32_SYSTEM_FALSE@am__objects_4 = \
+ at HAVE_W32_SYSTEM_FALSE@ libcommon_a-exechelp-posix.$(OBJEXT)
+am__objects_5 = libcommon_a-i18n.$(OBJEXT) \
+ libcommon_a-mapstrings.$(OBJEXT) \
+ libcommon_a-stringhelp.$(OBJEXT) libcommon_a-strlist.$(OBJEXT) \
+ libcommon_a-utf8conv.$(OBJEXT) libcommon_a-argparse.$(OBJEXT) \
+ libcommon_a-logging.$(OBJEXT) libcommon_a-dotlock.$(OBJEXT) \
+ libcommon_a-mischelp.$(OBJEXT) libcommon_a-status.$(OBJEXT) \
+ libcommon_a-tlv.$(OBJEXT) libcommon_a-init.$(OBJEXT) \
+ libcommon_a-sexputil.$(OBJEXT) libcommon_a-sysutils.$(OBJEXT) \
+ libcommon_a-homedir.$(OBJEXT) libcommon_a-gettime.$(OBJEXT) \
+ libcommon_a-yesno.$(OBJEXT) libcommon_a-b64enc.$(OBJEXT) \
+ libcommon_a-b64dec.$(OBJEXT) libcommon_a-zb32.$(OBJEXT) \
+ libcommon_a-convert.$(OBJEXT) libcommon_a-percent.$(OBJEXT) \
+ libcommon_a-mbox-util.$(OBJEXT) \
+ libcommon_a-miscellaneous.$(OBJEXT) \
+ libcommon_a-xasprintf.$(OBJEXT) \
+ libcommon_a-xreadline.$(OBJEXT) libcommon_a-membuf.$(OBJEXT) \
+ libcommon_a-iobuf.$(OBJEXT) libcommon_a-ttyio.$(OBJEXT) \
+ libcommon_a-asshelp.$(OBJEXT) libcommon_a-asshelp2.$(OBJEXT) \
+ libcommon_a-signal.$(OBJEXT) libcommon_a-audit.$(OBJEXT) \
+ libcommon_a-localename.$(OBJEXT) \
+ libcommon_a-session-env.$(OBJEXT) \
+ libcommon_a-userids.$(OBJEXT) \
+ libcommon_a-openpgp-oid.$(OBJEXT) \
+ libcommon_a-ssh-utils.$(OBJEXT) \
+ libcommon_a-agent-opt.$(OBJEXT) libcommon_a-helpfile.$(OBJEXT) \
- libcommon_a-mkdir_p.$(OBJEXT) $(am__objects_1) \
++ libcommon_a-mkdir_p.$(OBJEXT) libcommon_a-strlist.$(OBJEXT) \
++ libcommon_a-call-gpg.$(OBJEXT) $(am__objects_1) \
+ $(am__objects_2) $(am__objects_3) $(am__objects_4)
+am__objects_6 = libcommon_a-get-passphrase.$(OBJEXT)
- @USE_DNS_SRV_TRUE at am__objects_7 = libcommon_a-srv.$(OBJEXT)
- am_libcommon_a_OBJECTS = $(am__objects_5) $(am__objects_6) \
- $(am__objects_7)
++am_libcommon_a_OBJECTS = $(am__objects_5) $(am__objects_6)
+libcommon_a_OBJECTS = $(am_libcommon_a_OBJECTS)
+libcommonpth_a_AR = $(AR) $(ARFLAGS)
+libcommonpth_a_LIBADD =
+am__libcommonpth_a_SOURCES_DIST = common-defs.h util.h i18n.c i18n.h \
+ types.h host2net.h dynload.h w32help.h mapstrings.c \
+ stringhelp.c stringhelp.h strlist.c strlist.h utf8conv.c \
+ utf8conv.h argparse.c argparse.h logging.c logging.h dotlock.c \
+ dotlock.h mischelp.c mischelp.h status.c status.h shareddefs.h \
+ openpgpdefs.h gc-opt-flags.h keyserver.h sexp-parse.h tlv.c \
+ tlv.h init.c init.h sexputil.c sysutils.c sysutils.h homedir.c \
- gettime.c gettime.h yesno.c b64enc.c b64dec.c zb32.c convert.c \
- percent.c mbox-util.c mbox-util.h miscellaneous.c xasprintf.c \
- xreadline.c membuf.c membuf.h iobuf.c iobuf.h ttyio.c ttyio.h \
- asshelp.c asshelp2.c asshelp.h exechelp.h signal.c audit.c \
- audit.h srv.h localename.c session-env.c session-env.h \
- userids.c userids.h openpgp-oid.c ssh-utils.c ssh-utils.h \
- agent-opt.c helpfile.c mkdir_p.c mkdir_p.h w32-reg.c \
- w32-afunix.c w32-afunix.h exechelp-w32ce.c exechelp-w32.c \
- exechelp-posix.c srv.c
- @HAVE_W32_SYSTEM_TRUE at am__objects_8 = \
++ gettime.c gettime.h yesno.c b64enc.c b64dec.c zb32.c zb32.h \
++ convert.c percent.c mbox-util.c mbox-util.h miscellaneous.c \
++ xasprintf.c xreadline.c membuf.c membuf.h iobuf.c iobuf.h \
++ ttyio.c ttyio.h asshelp.c asshelp2.c asshelp.h exechelp.h \
++ signal.c audit.c audit.h localename.c session-env.c \
++ session-env.h userids.c userids.h openpgp-oid.c ssh-utils.c \
++ ssh-utils.h agent-opt.c helpfile.c mkdir_p.c mkdir_p.h \
++ call-gpg.c call-gpg.h w32-reg.c w32-afunix.c w32-afunix.h \
++ exechelp-w32ce.c exechelp-w32.c exechelp-posix.c
++ at HAVE_W32_SYSTEM_TRUE@am__objects_7 = \
+ at HAVE_W32_SYSTEM_TRUE@ libcommonpth_a-w32-reg.$(OBJEXT) \
+ at HAVE_W32_SYSTEM_TRUE@ libcommonpth_a-w32-afunix.$(OBJEXT)
- @HAVE_W32CE_SYSTEM_TRUE@@HAVE_W32_SYSTEM_TRUE at am__objects_9 = libcommonpth_a-exechelp-w32ce.$(OBJEXT)
- @HAVE_W32CE_SYSTEM_FALSE@@HAVE_W32_SYSTEM_TRUE at am__objects_10 = libcommonpth_a-exechelp-w32.$(OBJEXT)
- @HAVE_W32_SYSTEM_FALSE at am__objects_11 = libcommonpth_a-exechelp-posix.$(OBJEXT)
- am__objects_12 = libcommonpth_a-i18n.$(OBJEXT) \
++ at HAVE_W32CE_SYSTEM_TRUE@@HAVE_W32_SYSTEM_TRUE at am__objects_8 = libcommonpth_a-exechelp-w32ce.$(OBJEXT)
++ at HAVE_W32CE_SYSTEM_FALSE@@HAVE_W32_SYSTEM_TRUE at am__objects_9 = libcommonpth_a-exechelp-w32.$(OBJEXT)
++ at HAVE_W32_SYSTEM_FALSE@am__objects_10 = libcommonpth_a-exechelp-posix.$(OBJEXT)
++am__objects_11 = libcommonpth_a-i18n.$(OBJEXT) \
+ libcommonpth_a-mapstrings.$(OBJEXT) \
+ libcommonpth_a-stringhelp.$(OBJEXT) \
+ libcommonpth_a-strlist.$(OBJEXT) \
+ libcommonpth_a-utf8conv.$(OBJEXT) \
+ libcommonpth_a-argparse.$(OBJEXT) \
+ libcommonpth_a-logging.$(OBJEXT) \
+ libcommonpth_a-dotlock.$(OBJEXT) \
+ libcommonpth_a-mischelp.$(OBJEXT) \
+ libcommonpth_a-status.$(OBJEXT) libcommonpth_a-tlv.$(OBJEXT) \
+ libcommonpth_a-init.$(OBJEXT) \
+ libcommonpth_a-sexputil.$(OBJEXT) \
+ libcommonpth_a-sysutils.$(OBJEXT) \
+ libcommonpth_a-homedir.$(OBJEXT) \
+ libcommonpth_a-gettime.$(OBJEXT) \
+ libcommonpth_a-yesno.$(OBJEXT) libcommonpth_a-b64enc.$(OBJEXT) \
+ libcommonpth_a-b64dec.$(OBJEXT) libcommonpth_a-zb32.$(OBJEXT) \
+ libcommonpth_a-convert.$(OBJEXT) \
+ libcommonpth_a-percent.$(OBJEXT) \
+ libcommonpth_a-mbox-util.$(OBJEXT) \
+ libcommonpth_a-miscellaneous.$(OBJEXT) \
+ libcommonpth_a-xasprintf.$(OBJEXT) \
+ libcommonpth_a-xreadline.$(OBJEXT) \
+ libcommonpth_a-membuf.$(OBJEXT) libcommonpth_a-iobuf.$(OBJEXT) \
+ libcommonpth_a-ttyio.$(OBJEXT) \
+ libcommonpth_a-asshelp.$(OBJEXT) \
+ libcommonpth_a-asshelp2.$(OBJEXT) \
+ libcommonpth_a-signal.$(OBJEXT) libcommonpth_a-audit.$(OBJEXT) \
+ libcommonpth_a-localename.$(OBJEXT) \
+ libcommonpth_a-session-env.$(OBJEXT) \
+ libcommonpth_a-userids.$(OBJEXT) \
+ libcommonpth_a-openpgp-oid.$(OBJEXT) \
+ libcommonpth_a-ssh-utils.$(OBJEXT) \
+ libcommonpth_a-agent-opt.$(OBJEXT) \
+ libcommonpth_a-helpfile.$(OBJEXT) \
- libcommonpth_a-mkdir_p.$(OBJEXT) $(am__objects_8) \
- $(am__objects_9) $(am__objects_10) $(am__objects_11)
- @USE_DNS_SRV_TRUE at am__objects_13 = libcommonpth_a-srv.$(OBJEXT)
- am_libcommonpth_a_OBJECTS = $(am__objects_12) $(am__objects_13)
++ libcommonpth_a-mkdir_p.$(OBJEXT) \
++ libcommonpth_a-strlist.$(OBJEXT) \
++ libcommonpth_a-call-gpg.$(OBJEXT) $(am__objects_7) \
++ $(am__objects_8) $(am__objects_9) $(am__objects_10)
++am_libcommonpth_a_OBJECTS = $(am__objects_11)
+libcommonpth_a_OBJECTS = $(am_libcommonpth_a_OBJECTS)
- libcommontls_a_AR = $(AR) $(ARFLAGS)
- libcommontls_a_LIBADD =
- am__objects_14 = libcommontls_a-http.$(OBJEXT)
- am_libcommontls_a_OBJECTS = $(am__objects_14)
- libcommontls_a_OBJECTS = $(am_libcommontls_a_OBJECTS)
- libcommontlsnpth_a_AR = $(AR) $(ARFLAGS)
- libcommontlsnpth_a_LIBADD =
- am__objects_15 = libcommontlsnpth_a-http.$(OBJEXT)
- am_libcommontlsnpth_a_OBJECTS = $(am__objects_15)
- libcommontlsnpth_a_OBJECTS = $(am_libcommontlsnpth_a_OBJECTS)
+libgpgrl_a_AR = $(AR) $(ARFLAGS)
+libgpgrl_a_LIBADD =
+am_libgpgrl_a_OBJECTS = gpgrlhelp.$(OBJEXT)
+libgpgrl_a_OBJECTS = $(am_libgpgrl_a_OBJECTS)
+libsimple_pwquery_a_AR = $(AR) $(ARFLAGS)
+libsimple_pwquery_a_LIBADD =
+am__libsimple_pwquery_a_SOURCES_DIST = simple-pwquery.c \
+ simple-pwquery.h asshelp.c asshelp.h
+ at HAVE_W32CE_SYSTEM_FALSE@am_libsimple_pwquery_a_OBJECTS = libsimple_pwquery_a-simple-pwquery.$(OBJEXT) \
+ at HAVE_W32CE_SYSTEM_FALSE@ libsimple_pwquery_a-asshelp.$(OBJEXT)
+libsimple_pwquery_a_OBJECTS = $(am_libsimple_pwquery_a_OBJECTS)
+ at HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_1 = t-exechelp$(EXEEXT)
+ at HAVE_W32_SYSTEM_TRUE@am__EXEEXT_2 = t-w32-reg$(EXEEXT)
+am__EXEEXT_3 = t-stringhelp$(EXEEXT) t-timestuff$(EXEEXT) \
+ t-convert$(EXEEXT) t-percent$(EXEEXT) t-gettime$(EXEEXT) \
+ t-sysutils$(EXEEXT) t-sexputil$(EXEEXT) t-session-env$(EXEEXT) \
+ t-openpgp-oid$(EXEEXT) t-ssh-utils$(EXEEXT) \
+ t-mapstrings$(EXEEXT) t-zb32$(EXEEXT) t-mbox-util$(EXEEXT) \
- t-iobuf$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
++ t-iobuf$(EXEEXT) t-strlist$(EXEEXT) $(am__EXEEXT_1) \
++ $(am__EXEEXT_2)
+ at MAINTAINER_MODE_TRUE@am__EXEEXT_4 = t-helpfile$(EXEEXT) \
- @MAINTAINER_MODE_TRUE@ t-b64$(EXEEXT) t-http$(EXEEXT)
++ at MAINTAINER_MODE_TRUE@ t-b64$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+t_b64_SOURCES = t-b64.c
+t_b64_OBJECTS = t-b64.$(OBJEXT)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = libcommon.a $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+t_b64_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_convert_SOURCES = t-convert.c
+t_convert_OBJECTS = t-convert.$(OBJEXT)
+t_convert_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_exechelp_SOURCES = t-exechelp.c
+t_exechelp_OBJECTS = t-exechelp.$(OBJEXT)
+t_exechelp_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_gettime_SOURCES = t-gettime.c
+t_gettime_OBJECTS = t-gettime.$(OBJEXT)
+t_gettime_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_helpfile_SOURCES = t-helpfile.c
+t_helpfile_OBJECTS = t-helpfile.$(OBJEXT)
+t_helpfile_DEPENDENCIES = $(am__DEPENDENCIES_2)
- am_t_http_OBJECTS = t_http-t-http.$(OBJEXT)
- t_http_OBJECTS = $(am_t_http_OBJECTS)
- t_http_DEPENDENCIES = libcommontls.a $(am__DEPENDENCIES_2) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- t_http_LINK = $(CCLD) $(t_http_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+t_iobuf_SOURCES = t-iobuf.c
+t_iobuf_OBJECTS = t-iobuf.$(OBJEXT)
+t_iobuf_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_mapstrings_SOURCES = t-mapstrings.c
+t_mapstrings_OBJECTS = t-mapstrings.$(OBJEXT)
+t_mapstrings_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_mbox_util_SOURCES = t-mbox-util.c
+t_mbox_util_OBJECTS = t-mbox-util.$(OBJEXT)
+t_mbox_util_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_openpgp_oid_SOURCES = t-openpgp-oid.c
+t_openpgp_oid_OBJECTS = t-openpgp-oid.$(OBJEXT)
+t_openpgp_oid_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_percent_SOURCES = t-percent.c
+t_percent_OBJECTS = t-percent.$(OBJEXT)
+t_percent_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_session_env_SOURCES = t-session-env.c
+t_session_env_OBJECTS = t-session-env.$(OBJEXT)
+t_session_env_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_sexputil_SOURCES = t-sexputil.c
+t_sexputil_OBJECTS = t-sexputil.$(OBJEXT)
+t_sexputil_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_ssh_utils_SOURCES = t-ssh-utils.c
+t_ssh_utils_OBJECTS = t-ssh-utils.$(OBJEXT)
+t_ssh_utils_DEPENDENCIES = $(am__DEPENDENCIES_2)
- am__objects_16 =
- am_t_stringhelp_OBJECTS = t-stringhelp.$(OBJEXT) $(am__objects_16)
++am__objects_12 =
++am_t_stringhelp_OBJECTS = t-stringhelp.$(OBJEXT) $(am__objects_12)
+t_stringhelp_OBJECTS = $(am_t_stringhelp_OBJECTS)
+t_stringhelp_DEPENDENCIES = $(am__DEPENDENCIES_2)
++t_strlist_SOURCES = t-strlist.c
++t_strlist_OBJECTS = t-strlist.$(OBJEXT)
++t_strlist_DEPENDENCIES = $(am__DEPENDENCIES_2)
+t_sysutils_SOURCES = t-sysutils.c
+t_sysutils_OBJECTS = t-sysutils.$(OBJEXT)
+t_sysutils_DEPENDENCIES = $(am__DEPENDENCIES_2)
- am_t_timestuff_OBJECTS = t-timestuff.$(OBJEXT) $(am__objects_16)
++am_t_timestuff_OBJECTS = t-timestuff.$(OBJEXT) $(am__objects_12)
+t_timestuff_OBJECTS = $(am_t_timestuff_OBJECTS)
+t_timestuff_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__t_w32_reg_SOURCES_DIST = t-w32-reg.c t-support.h
+ at HAVE_W32_SYSTEM_TRUE@am_t_w32_reg_OBJECTS = t-w32-reg.$(OBJEXT) \
- @HAVE_W32_SYSTEM_TRUE@ $(am__objects_16)
++ at HAVE_W32_SYSTEM_TRUE@ $(am__objects_12)
+t_w32_reg_OBJECTS = $(am_t_w32_reg_OBJECTS)
+ at HAVE_W32_SYSTEM_TRUE@t_w32_reg_DEPENDENCIES = $(am__DEPENDENCIES_2)
- t_zb32_SOURCES = t-zb32.c
- t_zb32_OBJECTS = t-zb32.$(OBJEXT)
++am_t_zb32_OBJECTS = t-zb32.$(OBJEXT) $(am__objects_12)
++t_zb32_OBJECTS = $(am_t_zb32_OBJECTS)
+t_zb32_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(libcommon_a_SOURCES) $(libcommonpth_a_SOURCES) \
- $(libcommontls_a_SOURCES) $(libcommontlsnpth_a_SOURCES) \
+ $(libgpgrl_a_SOURCES) $(libsimple_pwquery_a_SOURCES) t-b64.c \
- t-convert.c t-exechelp.c t-gettime.c t-helpfile.c \
- $(t_http_SOURCES) t-iobuf.c t-mapstrings.c t-mbox-util.c \
- t-openpgp-oid.c t-percent.c t-session-env.c t-sexputil.c \
- t-ssh-utils.c $(t_stringhelp_SOURCES) t-sysutils.c \
- $(t_timestuff_SOURCES) $(t_w32_reg_SOURCES) t-zb32.c
++ t-convert.c t-exechelp.c t-gettime.c t-helpfile.c t-iobuf.c \
++ t-mapstrings.c t-mbox-util.c t-openpgp-oid.c t-percent.c \
++ t-session-env.c t-sexputil.c t-ssh-utils.c \
++ $(t_stringhelp_SOURCES) t-strlist.c t-sysutils.c \
++ $(t_timestuff_SOURCES) $(t_w32_reg_SOURCES) $(t_zb32_SOURCES)
+DIST_SOURCES = $(am__libcommon_a_SOURCES_DIST) \
- $(am__libcommonpth_a_SOURCES_DIST) $(libcommontls_a_SOURCES) \
- $(libcommontlsnpth_a_SOURCES) $(libgpgrl_a_SOURCES) \
++ $(am__libcommonpth_a_SOURCES_DIST) $(libgpgrl_a_SOURCES) \
+ $(am__libsimple_pwquery_a_SOURCES_DIST) t-b64.c t-convert.c \
- t-exechelp.c t-gettime.c t-helpfile.c $(t_http_SOURCES) \
- t-iobuf.c t-mapstrings.c t-mbox-util.c t-openpgp-oid.c \
- t-percent.c t-session-env.c t-sexputil.c t-ssh-utils.c \
- $(t_stringhelp_SOURCES) t-sysutils.c $(t_timestuff_SOURCES) \
- $(am__t_w32_reg_SOURCES_DIST) t-zb32.c
++ t-exechelp.c t-gettime.c t-helpfile.c t-iobuf.c t-mapstrings.c \
++ t-mbox-util.c t-openpgp-oid.c t-percent.c t-session-env.c \
++ t-sexputil.c t-ssh-utils.c $(t_stringhelp_SOURCES) t-strlist.c \
++ t-sysutils.c $(t_timestuff_SOURCES) \
++ $(am__t_w32_reg_SOURCES_DIST) $(t_zb32_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
+ audit-events.h status-codes.h ChangeLog.jnlib \
- ChangeLog-2011.include w32info-rc.h.in gnupg.ico tls-ca.pem
++ ChangeLog-2011.include w32info-rc.h.in gnupg.ico
+
+noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a \
- libcommontls.a libcommontlsnpth.a $(am__append_1)
++ $(am__append_1)
+BUILT_SOURCES = audit-events.h status-codes.h
+MAINTAINERCLEANFILES = audit-events.h status-codes.h
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(am__append_2) \
+ $(am__append_3) $(am__append_4) $(am__append_5) \
+ $(am__append_6) $(am__append_7) $(am__append_8)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs =
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+common_sources = common-defs.h util.h i18n.c i18n.h types.h host2net.h \
+ dynload.h w32help.h mapstrings.c stringhelp.c stringhelp.h \
+ strlist.c strlist.h utf8conv.c utf8conv.h argparse.c \
+ argparse.h logging.c logging.h dotlock.c dotlock.h mischelp.c \
+ mischelp.h status.c status.h shareddefs.h openpgpdefs.h \
+ gc-opt-flags.h keyserver.h sexp-parse.h tlv.c tlv.h init.c \
+ init.h sexputil.c sysutils.c sysutils.h homedir.c gettime.c \
- gettime.h yesno.c b64enc.c b64dec.c zb32.c convert.c percent.c \
- mbox-util.c mbox-util.h miscellaneous.c xasprintf.c \
++ gettime.h yesno.c b64enc.c b64dec.c zb32.c zb32.h convert.c \
++ percent.c mbox-util.c mbox-util.h miscellaneous.c xasprintf.c \
+ xreadline.c membuf.c membuf.h iobuf.c iobuf.h ttyio.c ttyio.h \
+ asshelp.c asshelp2.c asshelp.h exechelp.h signal.c audit.c \
- audit.h srv.h localename.c session-env.c session-env.h \
- userids.c userids.h openpgp-oid.c ssh-utils.c ssh-utils.h \
- agent-opt.c helpfile.c mkdir_p.c mkdir_p.h $(am__append_9) \
- $(am__append_10) $(am__append_11) $(am__append_12)
-
- # Sources possible requiring a TLS library are put into a separate
- # conveince library.
- tls_sources = \
- http.c http.h
-
++ audit.h localename.c session-env.c session-env.h userids.c \
++ userids.h openpgp-oid.c ssh-utils.c ssh-utils.h agent-opt.c \
++ helpfile.c mkdir_p.c mkdir_p.h strlist.c strlist.h call-gpg.c \
++ call-gpg.h $(am__append_9) $(am__append_10) $(am__append_11) \
++ $(am__append_12)
+
+# Sources only useful without NPTH.
+without_npth_sources = \
+ get-passphrase.c get-passphrase.h
+
- libcommon_a_SOURCES = $(common_sources) $(without_npth_sources) \
- $(am__append_13)
++libcommon_a_SOURCES = $(common_sources) $(without_npth_sources)
+libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1
- libcommonpth_a_SOURCES = $(common_sources) $(am__append_14)
++libcommonpth_a_SOURCES = $(common_sources)
+libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
- libcommontls_a_SOURCES = $(tls_sources)
- libcommontls_a_CFLAGS = $(AM_CFLAGS) $(LIBGNUTLS_CFLAGS) -DWITHOUT_NPTH=1
- libcommontlsnpth_a_SOURCES = $(tls_sources)
- libcommontlsnpth_a_CFLAGS = $(AM_CFLAGS) $(LIBGNUTLS_CFLAGS) $(NPTH_CFLAGS)
+ at HAVE_W32CE_SYSTEM_FALSE@libsimple_pwquery_a_SOURCES = \
+ at HAVE_W32CE_SYSTEM_FALSE@ simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
+
+ at HAVE_W32CE_SYSTEM_FALSE@libsimple_pwquery_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
+libgpgrl_a_SOURCES = \
+ gpgrlhelp.c
+
+
+#
+# Module tests
+#
+module_tests = t-stringhelp t-timestuff t-convert t-percent t-gettime \
+ t-sysutils t-sexputil t-session-env t-openpgp-oid t-ssh-utils \
- t-mapstrings t-zb32 t-mbox-util t-iobuf $(am__append_15) \
- $(am__append_16)
++ t-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist \
++ $(am__append_13) $(am__append_14)
+ at MAINTAINER_MODE_FALSE@module_maint_tests =
- @MAINTAINER_MODE_TRUE at module_maint_tests = t-helpfile t-b64 t-http
++ at MAINTAINER_MODE_TRUE@module_maint_tests = t-helpfile t-b64
+t_extra_src = t-support.h
+t_common_cflags = $(KSBA_CFLAGS) $(LIBGCRYPT_CFLAGS) \
+ $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
+
+t_common_ldadd = libcommon.a \
+ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
+ $(LIBINTL) $(LIBICONV)
+
+
+# Common tests
+t_stringhelp_SOURCES = t-stringhelp.c $(t_extra_src)
+t_stringhelp_LDADD = $(t_common_ldadd)
+t_timestuff_SOURCES = t-timestuff.c $(t_extra_src)
+t_timestuff_LDADD = $(t_common_ldadd)
+t_convert_LDADD = $(t_common_ldadd)
+t_percent_LDADD = $(t_common_ldadd)
+t_gettime_LDADD = $(t_common_ldadd)
+t_sysutils_LDADD = $(t_common_ldadd)
+t_helpfile_LDADD = $(t_common_ldadd)
+t_sexputil_LDADD = $(t_common_ldadd)
+t_b64_LDADD = $(t_common_ldadd)
+t_exechelp_LDADD = $(t_common_ldadd)
+t_session_env_LDADD = $(t_common_ldadd)
+t_openpgp_oid_LDADD = $(t_common_ldadd)
+t_ssh_utils_LDADD = $(t_common_ldadd)
+t_mapstrings_LDADD = $(t_common_ldadd)
++t_zb32_SOURCES = t-zb32.c $(t_extra_src)
+t_zb32_LDADD = $(t_common_ldadd)
+t_mbox_util_LDADD = $(t_common_ldadd)
+t_iobuf_LDADD = $(t_common_ldadd)
++t_strlist_LDADD = $(t_common_ldadd)
+
+# System specific test
+ at HAVE_W32_SYSTEM_TRUE@t_w32_reg_SOURCES = t-w32-reg.c $(t_extra_src)
+ at HAVE_W32_SYSTEM_TRUE@t_w32_reg_LDADD = $(t_common_ldadd)
-
- # http tests
- t_http_SOURCES = t-http.c
- t_http_CFLAGS = $(t_common_cflags) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS)
- t_http_LDADD = libcommontls.a $(t_common_ldadd) \
- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS)
-
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu common/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+w32info-rc.h: $(top_builddir)/config.status $(srcdir)/w32info-rc.h.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libcommon.a: $(libcommon_a_OBJECTS) $(libcommon_a_DEPENDENCIES) $(EXTRA_libcommon_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libcommon.a
+ $(AM_V_AR)$(libcommon_a_AR) libcommon.a $(libcommon_a_OBJECTS) $(libcommon_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libcommon.a
+
+libcommonpth.a: $(libcommonpth_a_OBJECTS) $(libcommonpth_a_DEPENDENCIES) $(EXTRA_libcommonpth_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libcommonpth.a
+ $(AM_V_AR)$(libcommonpth_a_AR) libcommonpth.a $(libcommonpth_a_OBJECTS) $(libcommonpth_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libcommonpth.a
+
- libcommontls.a: $(libcommontls_a_OBJECTS) $(libcommontls_a_DEPENDENCIES) $(EXTRA_libcommontls_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libcommontls.a
- $(AM_V_AR)$(libcommontls_a_AR) libcommontls.a $(libcommontls_a_OBJECTS) $(libcommontls_a_LIBADD)
- $(AM_V_at)$(RANLIB) libcommontls.a
-
- libcommontlsnpth.a: $(libcommontlsnpth_a_OBJECTS) $(libcommontlsnpth_a_DEPENDENCIES) $(EXTRA_libcommontlsnpth_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libcommontlsnpth.a
- $(AM_V_AR)$(libcommontlsnpth_a_AR) libcommontlsnpth.a $(libcommontlsnpth_a_OBJECTS) $(libcommontlsnpth_a_LIBADD)
- $(AM_V_at)$(RANLIB) libcommontlsnpth.a
-
+libgpgrl.a: $(libgpgrl_a_OBJECTS) $(libgpgrl_a_DEPENDENCIES) $(EXTRA_libgpgrl_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libgpgrl.a
+ $(AM_V_AR)$(libgpgrl_a_AR) libgpgrl.a $(libgpgrl_a_OBJECTS) $(libgpgrl_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libgpgrl.a
+
+libsimple-pwquery.a: $(libsimple_pwquery_a_OBJECTS) $(libsimple_pwquery_a_DEPENDENCIES) $(EXTRA_libsimple_pwquery_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libsimple-pwquery.a
+ $(AM_V_AR)$(libsimple_pwquery_a_AR) libsimple-pwquery.a $(libsimple_pwquery_a_OBJECTS) $(libsimple_pwquery_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libsimple-pwquery.a
+
+clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+t-b64$(EXEEXT): $(t_b64_OBJECTS) $(t_b64_DEPENDENCIES) $(EXTRA_t_b64_DEPENDENCIES)
+ @rm -f t-b64$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_b64_OBJECTS) $(t_b64_LDADD) $(LIBS)
+
+t-convert$(EXEEXT): $(t_convert_OBJECTS) $(t_convert_DEPENDENCIES) $(EXTRA_t_convert_DEPENDENCIES)
+ @rm -f t-convert$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_convert_OBJECTS) $(t_convert_LDADD) $(LIBS)
+
+t-exechelp$(EXEEXT): $(t_exechelp_OBJECTS) $(t_exechelp_DEPENDENCIES) $(EXTRA_t_exechelp_DEPENDENCIES)
+ @rm -f t-exechelp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_exechelp_OBJECTS) $(t_exechelp_LDADD) $(LIBS)
+
+t-gettime$(EXEEXT): $(t_gettime_OBJECTS) $(t_gettime_DEPENDENCIES) $(EXTRA_t_gettime_DEPENDENCIES)
+ @rm -f t-gettime$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_gettime_OBJECTS) $(t_gettime_LDADD) $(LIBS)
+
+t-helpfile$(EXEEXT): $(t_helpfile_OBJECTS) $(t_helpfile_DEPENDENCIES) $(EXTRA_t_helpfile_DEPENDENCIES)
+ @rm -f t-helpfile$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_helpfile_OBJECTS) $(t_helpfile_LDADD) $(LIBS)
+
- t-http$(EXEEXT): $(t_http_OBJECTS) $(t_http_DEPENDENCIES) $(EXTRA_t_http_DEPENDENCIES)
- @rm -f t-http$(EXEEXT)
- $(AM_V_CCLD)$(t_http_LINK) $(t_http_OBJECTS) $(t_http_LDADD) $(LIBS)
-
+t-iobuf$(EXEEXT): $(t_iobuf_OBJECTS) $(t_iobuf_DEPENDENCIES) $(EXTRA_t_iobuf_DEPENDENCIES)
+ @rm -f t-iobuf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_iobuf_OBJECTS) $(t_iobuf_LDADD) $(LIBS)
+
+t-mapstrings$(EXEEXT): $(t_mapstrings_OBJECTS) $(t_mapstrings_DEPENDENCIES) $(EXTRA_t_mapstrings_DEPENDENCIES)
+ @rm -f t-mapstrings$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_mapstrings_OBJECTS) $(t_mapstrings_LDADD) $(LIBS)
+
+t-mbox-util$(EXEEXT): $(t_mbox_util_OBJECTS) $(t_mbox_util_DEPENDENCIES) $(EXTRA_t_mbox_util_DEPENDENCIES)
+ @rm -f t-mbox-util$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_mbox_util_OBJECTS) $(t_mbox_util_LDADD) $(LIBS)
+
+t-openpgp-oid$(EXEEXT): $(t_openpgp_oid_OBJECTS) $(t_openpgp_oid_DEPENDENCIES) $(EXTRA_t_openpgp_oid_DEPENDENCIES)
+ @rm -f t-openpgp-oid$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_openpgp_oid_OBJECTS) $(t_openpgp_oid_LDADD) $(LIBS)
+
+t-percent$(EXEEXT): $(t_percent_OBJECTS) $(t_percent_DEPENDENCIES) $(EXTRA_t_percent_DEPENDENCIES)
+ @rm -f t-percent$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_percent_OBJECTS) $(t_percent_LDADD) $(LIBS)
+
+t-session-env$(EXEEXT): $(t_session_env_OBJECTS) $(t_session_env_DEPENDENCIES) $(EXTRA_t_session_env_DEPENDENCIES)
+ @rm -f t-session-env$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_session_env_OBJECTS) $(t_session_env_LDADD) $(LIBS)
+
+t-sexputil$(EXEEXT): $(t_sexputil_OBJECTS) $(t_sexputil_DEPENDENCIES) $(EXTRA_t_sexputil_DEPENDENCIES)
+ @rm -f t-sexputil$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_sexputil_OBJECTS) $(t_sexputil_LDADD) $(LIBS)
+
+t-ssh-utils$(EXEEXT): $(t_ssh_utils_OBJECTS) $(t_ssh_utils_DEPENDENCIES) $(EXTRA_t_ssh_utils_DEPENDENCIES)
+ @rm -f t-ssh-utils$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_ssh_utils_OBJECTS) $(t_ssh_utils_LDADD) $(LIBS)
+
+t-stringhelp$(EXEEXT): $(t_stringhelp_OBJECTS) $(t_stringhelp_DEPENDENCIES) $(EXTRA_t_stringhelp_DEPENDENCIES)
+ @rm -f t-stringhelp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_stringhelp_OBJECTS) $(t_stringhelp_LDADD) $(LIBS)
+
++t-strlist$(EXEEXT): $(t_strlist_OBJECTS) $(t_strlist_DEPENDENCIES) $(EXTRA_t_strlist_DEPENDENCIES)
++ @rm -f t-strlist$(EXEEXT)
++ $(AM_V_CCLD)$(LINK) $(t_strlist_OBJECTS) $(t_strlist_LDADD) $(LIBS)
++
+t-sysutils$(EXEEXT): $(t_sysutils_OBJECTS) $(t_sysutils_DEPENDENCIES) $(EXTRA_t_sysutils_DEPENDENCIES)
+ @rm -f t-sysutils$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_sysutils_OBJECTS) $(t_sysutils_LDADD) $(LIBS)
+
+t-timestuff$(EXEEXT): $(t_timestuff_OBJECTS) $(t_timestuff_DEPENDENCIES) $(EXTRA_t_timestuff_DEPENDENCIES)
+ @rm -f t-timestuff$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_timestuff_OBJECTS) $(t_timestuff_LDADD) $(LIBS)
+
+t-w32-reg$(EXEEXT): $(t_w32_reg_OBJECTS) $(t_w32_reg_DEPENDENCIES) $(EXTRA_t_w32_reg_DEPENDENCIES)
+ @rm -f t-w32-reg$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_w32_reg_OBJECTS) $(t_w32_reg_LDADD) $(LIBS)
+
+t-zb32$(EXEEXT): $(t_zb32_OBJECTS) $(t_zb32_DEPENDENCIES) $(EXTRA_t_zb32_DEPENDENCIES)
+ @rm -f t-zb32$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_zb32_OBJECTS) $(t_zb32_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgrlhelp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-agent-opt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-argparse.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-asshelp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-asshelp2.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-audit.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-b64dec.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-b64enc.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-call-gpg.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-convert.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-dotlock.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-exechelp-posix.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-exechelp-w32.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-exechelp-w32ce.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-get-passphrase.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-gettime.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-helpfile.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-homedir.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-i18n.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-init.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-iobuf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-localename.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-logging.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-mapstrings.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-mbox-util.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-membuf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-miscellaneous.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-mischelp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-mkdir_p.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-openpgp-oid.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-percent.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-session-env.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-sexputil.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-signal.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-srv.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-ssh-utils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-status.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-stringhelp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-strlist.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-sysutils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-tlv.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-ttyio.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-userids.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-utf8conv.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-w32-afunix.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-w32-reg.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-xasprintf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-xreadline.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-yesno.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommon_a-zb32.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-agent-opt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-argparse.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-asshelp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-asshelp2.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-audit.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-b64dec.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-b64enc.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-call-gpg.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-convert.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-dotlock.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-exechelp-posix.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-exechelp-w32.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-exechelp-w32ce.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-gettime.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-helpfile.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-homedir.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-i18n.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-init.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-iobuf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-localename.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-logging.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-mapstrings.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-mbox-util.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-membuf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-miscellaneous.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-mischelp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-mkdir_p.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-openpgp-oid.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-percent.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-session-env.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-sexputil.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-signal.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-srv.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-ssh-utils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-status.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-stringhelp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-strlist.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-sysutils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-tlv.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-ttyio.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-userids.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-utf8conv.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-w32-afunix.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-w32-reg.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-xasprintf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-xreadline.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-yesno.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommonpth_a-zb32.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommontls_a-http.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcommontlsnpth_a-http.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsimple_pwquery_a-asshelp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsimple_pwquery_a-simple-pwquery.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-b64.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-convert.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-exechelp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-gettime.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-helpfile.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-iobuf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-mapstrings.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-mbox-util.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-openpgp-oid.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-percent.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-session-env.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-sexputil.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-ssh-utils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-stringhelp.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-strlist.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-sysutils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-timestuff.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-w32-reg.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-zb32.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_http-t-http.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+libcommon_a-i18n.o: i18n.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-i18n.o -MD -MP -MF $(DEPDIR)/libcommon_a-i18n.Tpo -c -o libcommon_a-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-i18n.Tpo $(DEPDIR)/libcommon_a-i18n.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='i18n.c' object='libcommon_a-i18n.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+
+libcommon_a-i18n.obj: i18n.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-i18n.obj -MD -MP -MF $(DEPDIR)/libcommon_a-i18n.Tpo -c -o libcommon_a-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-i18n.Tpo $(DEPDIR)/libcommon_a-i18n.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='i18n.c' object='libcommon_a-i18n.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+
+libcommon_a-mapstrings.o: mapstrings.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-mapstrings.o -MD -MP -MF $(DEPDIR)/libcommon_a-mapstrings.Tpo -c -o libcommon_a-mapstrings.o `test -f 'mapstrings.c' || echo '$(srcdir)/'`mapstrings.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-mapstrings.Tpo $(DEPDIR)/libcommon_a-mapstrings.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mapstrings.c' object='libcommon_a-mapstrings.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-mapstrings.o `test -f 'mapstrings.c' || echo '$(srcdir)/'`mapstrings.c
+
+libcommon_a-mapstrings.obj: mapstrings.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-mapstrings.obj -MD -MP -MF $(DEPDIR)/libcommon_a-mapstrings.Tpo -c -o libcommon_a-mapstrings.obj `if test -f 'mapstrings.c'; then $(CYGPATH_W) 'mapstrings.c'; else $(CYGPATH_W) '$(srcdir)/mapstrings.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-mapstrings.Tpo $(DEPDIR)/libcommon_a-mapstrings.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mapstrings.c' object='libcommon_a-mapstrings.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-mapstrings.obj `if test -f 'mapstrings.c'; then $(CYGPATH_W) 'mapstrings.c'; else $(CYGPATH_W) '$(srcdir)/mapstrings.c'; fi`
+
+libcommon_a-stringhelp.o: stringhelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-stringhelp.o -MD -MP -MF $(DEPDIR)/libcommon_a-stringhelp.Tpo -c -o libcommon_a-stringhelp.o `test -f 'stringhelp.c' || echo '$(srcdir)/'`stringhelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-stringhelp.Tpo $(DEPDIR)/libcommon_a-stringhelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stringhelp.c' object='libcommon_a-stringhelp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-stringhelp.o `test -f 'stringhelp.c' || echo '$(srcdir)/'`stringhelp.c
+
+libcommon_a-stringhelp.obj: stringhelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-stringhelp.obj -MD -MP -MF $(DEPDIR)/libcommon_a-stringhelp.Tpo -c -o libcommon_a-stringhelp.obj `if test -f 'stringhelp.c'; then $(CYGPATH_W) 'stringhelp.c'; else $(CYGPATH_W) '$(srcdir)/stringhelp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-stringhelp.Tpo $(DEPDIR)/libcommon_a-stringhelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stringhelp.c' object='libcommon_a-stringhelp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-stringhelp.obj `if test -f 'stringhelp.c'; then $(CYGPATH_W) 'stringhelp.c'; else $(CYGPATH_W) '$(srcdir)/stringhelp.c'; fi`
+
+libcommon_a-strlist.o: strlist.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-strlist.o -MD -MP -MF $(DEPDIR)/libcommon_a-strlist.Tpo -c -o libcommon_a-strlist.o `test -f 'strlist.c' || echo '$(srcdir)/'`strlist.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-strlist.Tpo $(DEPDIR)/libcommon_a-strlist.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strlist.c' object='libcommon_a-strlist.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-strlist.o `test -f 'strlist.c' || echo '$(srcdir)/'`strlist.c
+
+libcommon_a-strlist.obj: strlist.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-strlist.obj -MD -MP -MF $(DEPDIR)/libcommon_a-strlist.Tpo -c -o libcommon_a-strlist.obj `if test -f 'strlist.c'; then $(CYGPATH_W) 'strlist.c'; else $(CYGPATH_W) '$(srcdir)/strlist.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-strlist.Tpo $(DEPDIR)/libcommon_a-strlist.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strlist.c' object='libcommon_a-strlist.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-strlist.obj `if test -f 'strlist.c'; then $(CYGPATH_W) 'strlist.c'; else $(CYGPATH_W) '$(srcdir)/strlist.c'; fi`
+
+libcommon_a-utf8conv.o: utf8conv.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-utf8conv.o -MD -MP -MF $(DEPDIR)/libcommon_a-utf8conv.Tpo -c -o libcommon_a-utf8conv.o `test -f 'utf8conv.c' || echo '$(srcdir)/'`utf8conv.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-utf8conv.Tpo $(DEPDIR)/libcommon_a-utf8conv.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utf8conv.c' object='libcommon_a-utf8conv.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-utf8conv.o `test -f 'utf8conv.c' || echo '$(srcdir)/'`utf8conv.c
+
+libcommon_a-utf8conv.obj: utf8conv.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-utf8conv.obj -MD -MP -MF $(DEPDIR)/libcommon_a-utf8conv.Tpo -c -o libcommon_a-utf8conv.obj `if test -f 'utf8conv.c'; then $(CYGPATH_W) 'utf8conv.c'; else $(CYGPATH_W) '$(srcdir)/utf8conv.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-utf8conv.Tpo $(DEPDIR)/libcommon_a-utf8conv.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utf8conv.c' object='libcommon_a-utf8conv.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-utf8conv.obj `if test -f 'utf8conv.c'; then $(CYGPATH_W) 'utf8conv.c'; else $(CYGPATH_W) '$(srcdir)/utf8conv.c'; fi`
+
+libcommon_a-argparse.o: argparse.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-argparse.o -MD -MP -MF $(DEPDIR)/libcommon_a-argparse.Tpo -c -o libcommon_a-argparse.o `test -f 'argparse.c' || echo '$(srcdir)/'`argparse.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-argparse.Tpo $(DEPDIR)/libcommon_a-argparse.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='argparse.c' object='libcommon_a-argparse.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-argparse.o `test -f 'argparse.c' || echo '$(srcdir)/'`argparse.c
+
+libcommon_a-argparse.obj: argparse.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-argparse.obj -MD -MP -MF $(DEPDIR)/libcommon_a-argparse.Tpo -c -o libcommon_a-argparse.obj `if test -f 'argparse.c'; then $(CYGPATH_W) 'argparse.c'; else $(CYGPATH_W) '$(srcdir)/argparse.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-argparse.Tpo $(DEPDIR)/libcommon_a-argparse.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='argparse.c' object='libcommon_a-argparse.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-argparse.obj `if test -f 'argparse.c'; then $(CYGPATH_W) 'argparse.c'; else $(CYGPATH_W) '$(srcdir)/argparse.c'; fi`
+
+libcommon_a-logging.o: logging.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-logging.o -MD -MP -MF $(DEPDIR)/libcommon_a-logging.Tpo -c -o libcommon_a-logging.o `test -f 'logging.c' || echo '$(srcdir)/'`logging.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-logging.Tpo $(DEPDIR)/libcommon_a-logging.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='logging.c' object='libcommon_a-logging.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-logging.o `test -f 'logging.c' || echo '$(srcdir)/'`logging.c
+
+libcommon_a-logging.obj: logging.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-logging.obj -MD -MP -MF $(DEPDIR)/libcommon_a-logging.Tpo -c -o libcommon_a-logging.obj `if test -f 'logging.c'; then $(CYGPATH_W) 'logging.c'; else $(CYGPATH_W) '$(srcdir)/logging.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-logging.Tpo $(DEPDIR)/libcommon_a-logging.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='logging.c' object='libcommon_a-logging.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-logging.obj `if test -f 'logging.c'; then $(CYGPATH_W) 'logging.c'; else $(CYGPATH_W) '$(srcdir)/logging.c'; fi`
+
+libcommon_a-dotlock.o: dotlock.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-dotlock.o -MD -MP -MF $(DEPDIR)/libcommon_a-dotlock.Tpo -c -o libcommon_a-dotlock.o `test -f 'dotlock.c' || echo '$(srcdir)/'`dotlock.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-dotlock.Tpo $(DEPDIR)/libcommon_a-dotlock.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dotlock.c' object='libcommon_a-dotlock.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-dotlock.o `test -f 'dotlock.c' || echo '$(srcdir)/'`dotlock.c
+
+libcommon_a-dotlock.obj: dotlock.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-dotlock.obj -MD -MP -MF $(DEPDIR)/libcommon_a-dotlock.Tpo -c -o libcommon_a-dotlock.obj `if test -f 'dotlock.c'; then $(CYGPATH_W) 'dotlock.c'; else $(CYGPATH_W) '$(srcdir)/dotlock.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-dotlock.Tpo $(DEPDIR)/libcommon_a-dotlock.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dotlock.c' object='libcommon_a-dotlock.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-dotlock.obj `if test -f 'dotlock.c'; then $(CYGPATH_W) 'dotlock.c'; else $(CYGPATH_W) '$(srcdir)/dotlock.c'; fi`
+
+libcommon_a-mischelp.o: mischelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-mischelp.o -MD -MP -MF $(DEPDIR)/libcommon_a-mischelp.Tpo -c -o libcommon_a-mischelp.o `test -f 'mischelp.c' || echo '$(srcdir)/'`mischelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-mischelp.Tpo $(DEPDIR)/libcommon_a-mischelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mischelp.c' object='libcommon_a-mischelp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-mischelp.o `test -f 'mischelp.c' || echo '$(srcdir)/'`mischelp.c
+
+libcommon_a-mischelp.obj: mischelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-mischelp.obj -MD -MP -MF $(DEPDIR)/libcommon_a-mischelp.Tpo -c -o libcommon_a-mischelp.obj `if test -f 'mischelp.c'; then $(CYGPATH_W) 'mischelp.c'; else $(CYGPATH_W) '$(srcdir)/mischelp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-mischelp.Tpo $(DEPDIR)/libcommon_a-mischelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mischelp.c' object='libcommon_a-mischelp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-mischelp.obj `if test -f 'mischelp.c'; then $(CYGPATH_W) 'mischelp.c'; else $(CYGPATH_W) '$(srcdir)/mischelp.c'; fi`
+
+libcommon_a-status.o: status.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-status.o -MD -MP -MF $(DEPDIR)/libcommon_a-status.Tpo -c -o libcommon_a-status.o `test -f 'status.c' || echo '$(srcdir)/'`status.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-status.Tpo $(DEPDIR)/libcommon_a-status.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='status.c' object='libcommon_a-status.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-status.o `test -f 'status.c' || echo '$(srcdir)/'`status.c
+
+libcommon_a-status.obj: status.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-status.obj -MD -MP -MF $(DEPDIR)/libcommon_a-status.Tpo -c -o libcommon_a-status.obj `if test -f 'status.c'; then $(CYGPATH_W) 'status.c'; else $(CYGPATH_W) '$(srcdir)/status.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-status.Tpo $(DEPDIR)/libcommon_a-status.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='status.c' object='libcommon_a-status.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-status.obj `if test -f 'status.c'; then $(CYGPATH_W) 'status.c'; else $(CYGPATH_W) '$(srcdir)/status.c'; fi`
+
+libcommon_a-tlv.o: tlv.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-tlv.o -MD -MP -MF $(DEPDIR)/libcommon_a-tlv.Tpo -c -o libcommon_a-tlv.o `test -f 'tlv.c' || echo '$(srcdir)/'`tlv.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-tlv.Tpo $(DEPDIR)/libcommon_a-tlv.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tlv.c' object='libcommon_a-tlv.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-tlv.o `test -f 'tlv.c' || echo '$(srcdir)/'`tlv.c
+
+libcommon_a-tlv.obj: tlv.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-tlv.obj -MD -MP -MF $(DEPDIR)/libcommon_a-tlv.Tpo -c -o libcommon_a-tlv.obj `if test -f 'tlv.c'; then $(CYGPATH_W) 'tlv.c'; else $(CYGPATH_W) '$(srcdir)/tlv.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-tlv.Tpo $(DEPDIR)/libcommon_a-tlv.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tlv.c' object='libcommon_a-tlv.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-tlv.obj `if test -f 'tlv.c'; then $(CYGPATH_W) 'tlv.c'; else $(CYGPATH_W) '$(srcdir)/tlv.c'; fi`
+
+libcommon_a-init.o: init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-init.o -MD -MP -MF $(DEPDIR)/libcommon_a-init.Tpo -c -o libcommon_a-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-init.Tpo $(DEPDIR)/libcommon_a-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='init.c' object='libcommon_a-init.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c
+
+libcommon_a-init.obj: init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-init.obj -MD -MP -MF $(DEPDIR)/libcommon_a-init.Tpo -c -o libcommon_a-init.obj `if test -f 'init.c'; then $(CYGPATH_W) 'init.c'; else $(CYGPATH_W) '$(srcdir)/init.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-init.Tpo $(DEPDIR)/libcommon_a-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='init.c' object='libcommon_a-init.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-init.obj `if test -f 'init.c'; then $(CYGPATH_W) 'init.c'; else $(CYGPATH_W) '$(srcdir)/init.c'; fi`
+
+libcommon_a-sexputil.o: sexputil.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-sexputil.o -MD -MP -MF $(DEPDIR)/libcommon_a-sexputil.Tpo -c -o libcommon_a-sexputil.o `test -f 'sexputil.c' || echo '$(srcdir)/'`sexputil.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-sexputil.Tpo $(DEPDIR)/libcommon_a-sexputil.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sexputil.c' object='libcommon_a-sexputil.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-sexputil.o `test -f 'sexputil.c' || echo '$(srcdir)/'`sexputil.c
+
+libcommon_a-sexputil.obj: sexputil.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-sexputil.obj -MD -MP -MF $(DEPDIR)/libcommon_a-sexputil.Tpo -c -o libcommon_a-sexputil.obj `if test -f 'sexputil.c'; then $(CYGPATH_W) 'sexputil.c'; else $(CYGPATH_W) '$(srcdir)/sexputil.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-sexputil.Tpo $(DEPDIR)/libcommon_a-sexputil.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sexputil.c' object='libcommon_a-sexputil.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-sexputil.obj `if test -f 'sexputil.c'; then $(CYGPATH_W) 'sexputil.c'; else $(CYGPATH_W) '$(srcdir)/sexputil.c'; fi`
+
+libcommon_a-sysutils.o: sysutils.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-sysutils.o -MD -MP -MF $(DEPDIR)/libcommon_a-sysutils.Tpo -c -o libcommon_a-sysutils.o `test -f 'sysutils.c' || echo '$(srcdir)/'`sysutils.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-sysutils.Tpo $(DEPDIR)/libcommon_a-sysutils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sysutils.c' object='libcommon_a-sysutils.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-sysutils.o `test -f 'sysutils.c' || echo '$(srcdir)/'`sysutils.c
+
+libcommon_a-sysutils.obj: sysutils.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-sysutils.obj -MD -MP -MF $(DEPDIR)/libcommon_a-sysutils.Tpo -c -o libcommon_a-sysutils.obj `if test -f 'sysutils.c'; then $(CYGPATH_W) 'sysutils.c'; else $(CYGPATH_W) '$(srcdir)/sysutils.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-sysutils.Tpo $(DEPDIR)/libcommon_a-sysutils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sysutils.c' object='libcommon_a-sysutils.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-sysutils.obj `if test -f 'sysutils.c'; then $(CYGPATH_W) 'sysutils.c'; else $(CYGPATH_W) '$(srcdir)/sysutils.c'; fi`
+
+libcommon_a-homedir.o: homedir.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-homedir.o -MD -MP -MF $(DEPDIR)/libcommon_a-homedir.Tpo -c -o libcommon_a-homedir.o `test -f 'homedir.c' || echo '$(srcdir)/'`homedir.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-homedir.Tpo $(DEPDIR)/libcommon_a-homedir.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='homedir.c' object='libcommon_a-homedir.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-homedir.o `test -f 'homedir.c' || echo '$(srcdir)/'`homedir.c
+
+libcommon_a-homedir.obj: homedir.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-homedir.obj -MD -MP -MF $(DEPDIR)/libcommon_a-homedir.Tpo -c -o libcommon_a-homedir.obj `if test -f 'homedir.c'; then $(CYGPATH_W) 'homedir.c'; else $(CYGPATH_W) '$(srcdir)/homedir.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-homedir.Tpo $(DEPDIR)/libcommon_a-homedir.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='homedir.c' object='libcommon_a-homedir.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-homedir.obj `if test -f 'homedir.c'; then $(CYGPATH_W) 'homedir.c'; else $(CYGPATH_W) '$(srcdir)/homedir.c'; fi`
+
+libcommon_a-gettime.o: gettime.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-gettime.o -MD -MP -MF $(DEPDIR)/libcommon_a-gettime.Tpo -c -o libcommon_a-gettime.o `test -f 'gettime.c' || echo '$(srcdir)/'`gettime.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-gettime.Tpo $(DEPDIR)/libcommon_a-gettime.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gettime.c' object='libcommon_a-gettime.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-gettime.o `test -f 'gettime.c' || echo '$(srcdir)/'`gettime.c
+
+libcommon_a-gettime.obj: gettime.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-gettime.obj -MD -MP -MF $(DEPDIR)/libcommon_a-gettime.Tpo -c -o libcommon_a-gettime.obj `if test -f 'gettime.c'; then $(CYGPATH_W) 'gettime.c'; else $(CYGPATH_W) '$(srcdir)/gettime.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-gettime.Tpo $(DEPDIR)/libcommon_a-gettime.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gettime.c' object='libcommon_a-gettime.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-gettime.obj `if test -f 'gettime.c'; then $(CYGPATH_W) 'gettime.c'; else $(CYGPATH_W) '$(srcdir)/gettime.c'; fi`
+
+libcommon_a-yesno.o: yesno.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-yesno.o -MD -MP -MF $(DEPDIR)/libcommon_a-yesno.Tpo -c -o libcommon_a-yesno.o `test -f 'yesno.c' || echo '$(srcdir)/'`yesno.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-yesno.Tpo $(DEPDIR)/libcommon_a-yesno.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='yesno.c' object='libcommon_a-yesno.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-yesno.o `test -f 'yesno.c' || echo '$(srcdir)/'`yesno.c
+
+libcommon_a-yesno.obj: yesno.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-yesno.obj -MD -MP -MF $(DEPDIR)/libcommon_a-yesno.Tpo -c -o libcommon_a-yesno.obj `if test -f 'yesno.c'; then $(CYGPATH_W) 'yesno.c'; else $(CYGPATH_W) '$(srcdir)/yesno.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-yesno.Tpo $(DEPDIR)/libcommon_a-yesno.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='yesno.c' object='libcommon_a-yesno.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-yesno.obj `if test -f 'yesno.c'; then $(CYGPATH_W) 'yesno.c'; else $(CYGPATH_W) '$(srcdir)/yesno.c'; fi`
+
+libcommon_a-b64enc.o: b64enc.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-b64enc.o -MD -MP -MF $(DEPDIR)/libcommon_a-b64enc.Tpo -c -o libcommon_a-b64enc.o `test -f 'b64enc.c' || echo '$(srcdir)/'`b64enc.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-b64enc.Tpo $(DEPDIR)/libcommon_a-b64enc.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='b64enc.c' object='libcommon_a-b64enc.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-b64enc.o `test -f 'b64enc.c' || echo '$(srcdir)/'`b64enc.c
+
+libcommon_a-b64enc.obj: b64enc.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-b64enc.obj -MD -MP -MF $(DEPDIR)/libcommon_a-b64enc.Tpo -c -o libcommon_a-b64enc.obj `if test -f 'b64enc.c'; then $(CYGPATH_W) 'b64enc.c'; else $(CYGPATH_W) '$(srcdir)/b64enc.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-b64enc.Tpo $(DEPDIR)/libcommon_a-b64enc.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='b64enc.c' object='libcommon_a-b64enc.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-b64enc.obj `if test -f 'b64enc.c'; then $(CYGPATH_W) 'b64enc.c'; else $(CYGPATH_W) '$(srcdir)/b64enc.c'; fi`
+
+libcommon_a-b64dec.o: b64dec.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-b64dec.o -MD -MP -MF $(DEPDIR)/libcommon_a-b64dec.Tpo -c -o libcommon_a-b64dec.o `test -f 'b64dec.c' || echo '$(srcdir)/'`b64dec.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-b64dec.Tpo $(DEPDIR)/libcommon_a-b64dec.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='b64dec.c' object='libcommon_a-b64dec.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-b64dec.o `test -f 'b64dec.c' || echo '$(srcdir)/'`b64dec.c
+
+libcommon_a-b64dec.obj: b64dec.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-b64dec.obj -MD -MP -MF $(DEPDIR)/libcommon_a-b64dec.Tpo -c -o libcommon_a-b64dec.obj `if test -f 'b64dec.c'; then $(CYGPATH_W) 'b64dec.c'; else $(CYGPATH_W) '$(srcdir)/b64dec.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-b64dec.Tpo $(DEPDIR)/libcommon_a-b64dec.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='b64dec.c' object='libcommon_a-b64dec.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-b64dec.obj `if test -f 'b64dec.c'; then $(CYGPATH_W) 'b64dec.c'; else $(CYGPATH_W) '$(srcdir)/b64dec.c'; fi`
+
+libcommon_a-zb32.o: zb32.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-zb32.o -MD -MP -MF $(DEPDIR)/libcommon_a-zb32.Tpo -c -o libcommon_a-zb32.o `test -f 'zb32.c' || echo '$(srcdir)/'`zb32.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-zb32.Tpo $(DEPDIR)/libcommon_a-zb32.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='zb32.c' object='libcommon_a-zb32.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-zb32.o `test -f 'zb32.c' || echo '$(srcdir)/'`zb32.c
+
+libcommon_a-zb32.obj: zb32.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-zb32.obj -MD -MP -MF $(DEPDIR)/libcommon_a-zb32.Tpo -c -o libcommon_a-zb32.obj `if test -f 'zb32.c'; then $(CYGPATH_W) 'zb32.c'; else $(CYGPATH_W) '$(srcdir)/zb32.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-zb32.Tpo $(DEPDIR)/libcommon_a-zb32.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='zb32.c' object='libcommon_a-zb32.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-zb32.obj `if test -f 'zb32.c'; then $(CYGPATH_W) 'zb32.c'; else $(CYGPATH_W) '$(srcdir)/zb32.c'; fi`
+
+libcommon_a-convert.o: convert.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-convert.o -MD -MP -MF $(DEPDIR)/libcommon_a-convert.Tpo -c -o libcommon_a-convert.o `test -f 'convert.c' || echo '$(srcdir)/'`convert.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-convert.Tpo $(DEPDIR)/libcommon_a-convert.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='convert.c' object='libcommon_a-convert.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-convert.o `test -f 'convert.c' || echo '$(srcdir)/'`convert.c
+
+libcommon_a-convert.obj: convert.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-convert.obj -MD -MP -MF $(DEPDIR)/libcommon_a-convert.Tpo -c -o libcommon_a-convert.obj `if test -f 'convert.c'; then $(CYGPATH_W) 'convert.c'; else $(CYGPATH_W) '$(srcdir)/convert.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-convert.Tpo $(DEPDIR)/libcommon_a-convert.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='convert.c' object='libcommon_a-convert.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-convert.obj `if test -f 'convert.c'; then $(CYGPATH_W) 'convert.c'; else $(CYGPATH_W) '$(srcdir)/convert.c'; fi`
+
+libcommon_a-percent.o: percent.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-percent.o -MD -MP -MF $(DEPDIR)/libcommon_a-percent.Tpo -c -o libcommon_a-percent.o `test -f 'percent.c' || echo '$(srcdir)/'`percent.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-percent.Tpo $(DEPDIR)/libcommon_a-percent.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='percent.c' object='libcommon_a-percent.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-percent.o `test -f 'percent.c' || echo '$(srcdir)/'`percent.c
+
+libcommon_a-percent.obj: percent.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-percent.obj -MD -MP -MF $(DEPDIR)/libcommon_a-percent.Tpo -c -o libcommon_a-percent.obj `if test -f 'percent.c'; then $(CYGPATH_W) 'percent.c'; else $(CYGPATH_W) '$(srcdir)/percent.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-percent.Tpo $(DEPDIR)/libcommon_a-percent.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='percent.c' object='libcommon_a-percent.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-percent.obj `if test -f 'percent.c'; then $(CYGPATH_W) 'percent.c'; else $(CYGPATH_W) '$(srcdir)/percent.c'; fi`
+
+libcommon_a-mbox-util.o: mbox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-mbox-util.o -MD -MP -MF $(DEPDIR)/libcommon_a-mbox-util.Tpo -c -o libcommon_a-mbox-util.o `test -f 'mbox-util.c' || echo '$(srcdir)/'`mbox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-mbox-util.Tpo $(DEPDIR)/libcommon_a-mbox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbox-util.c' object='libcommon_a-mbox-util.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-mbox-util.o `test -f 'mbox-util.c' || echo '$(srcdir)/'`mbox-util.c
+
+libcommon_a-mbox-util.obj: mbox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-mbox-util.obj -MD -MP -MF $(DEPDIR)/libcommon_a-mbox-util.Tpo -c -o libcommon_a-mbox-util.obj `if test -f 'mbox-util.c'; then $(CYGPATH_W) 'mbox-util.c'; else $(CYGPATH_W) '$(srcdir)/mbox-util.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-mbox-util.Tpo $(DEPDIR)/libcommon_a-mbox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbox-util.c' object='libcommon_a-mbox-util.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-mbox-util.obj `if test -f 'mbox-util.c'; then $(CYGPATH_W) 'mbox-util.c'; else $(CYGPATH_W) '$(srcdir)/mbox-util.c'; fi`
+
+libcommon_a-miscellaneous.o: miscellaneous.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-miscellaneous.o -MD -MP -MF $(DEPDIR)/libcommon_a-miscellaneous.Tpo -c -o libcommon_a-miscellaneous.o `test -f 'miscellaneous.c' || echo '$(srcdir)/'`miscellaneous.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-miscellaneous.Tpo $(DEPDIR)/libcommon_a-miscellaneous.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='miscellaneous.c' object='libcommon_a-miscellaneous.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-miscellaneous.o `test -f 'miscellaneous.c' || echo '$(srcdir)/'`miscellaneous.c
+
+libcommon_a-miscellaneous.obj: miscellaneous.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-miscellaneous.obj -MD -MP -MF $(DEPDIR)/libcommon_a-miscellaneous.Tpo -c -o libcommon_a-miscellaneous.obj `if test -f 'miscellaneous.c'; then $(CYGPATH_W) 'miscellaneous.c'; else $(CYGPATH_W) '$(srcdir)/miscellaneous.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-miscellaneous.Tpo $(DEPDIR)/libcommon_a-miscellaneous.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='miscellaneous.c' object='libcommon_a-miscellaneous.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-miscellaneous.obj `if test -f 'miscellaneous.c'; then $(CYGPATH_W) 'miscellaneous.c'; else $(CYGPATH_W) '$(srcdir)/miscellaneous.c'; fi`
+
+libcommon_a-xasprintf.o: xasprintf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-xasprintf.o -MD -MP -MF $(DEPDIR)/libcommon_a-xasprintf.Tpo -c -o libcommon_a-xasprintf.o `test -f 'xasprintf.c' || echo '$(srcdir)/'`xasprintf.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-xasprintf.Tpo $(DEPDIR)/libcommon_a-xasprintf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xasprintf.c' object='libcommon_a-xasprintf.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-xasprintf.o `test -f 'xasprintf.c' || echo '$(srcdir)/'`xasprintf.c
+
+libcommon_a-xasprintf.obj: xasprintf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-xasprintf.obj -MD -MP -MF $(DEPDIR)/libcommon_a-xasprintf.Tpo -c -o libcommon_a-xasprintf.obj `if test -f 'xasprintf.c'; then $(CYGPATH_W) 'xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/xasprintf.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-xasprintf.Tpo $(DEPDIR)/libcommon_a-xasprintf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xasprintf.c' object='libcommon_a-xasprintf.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-xasprintf.obj `if test -f 'xasprintf.c'; then $(CYGPATH_W) 'xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/xasprintf.c'; fi`
+
+libcommon_a-xreadline.o: xreadline.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-xreadline.o -MD -MP -MF $(DEPDIR)/libcommon_a-xreadline.Tpo -c -o libcommon_a-xreadline.o `test -f 'xreadline.c' || echo '$(srcdir)/'`xreadline.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-xreadline.Tpo $(DEPDIR)/libcommon_a-xreadline.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xreadline.c' object='libcommon_a-xreadline.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-xreadline.o `test -f 'xreadline.c' || echo '$(srcdir)/'`xreadline.c
+
+libcommon_a-xreadline.obj: xreadline.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-xreadline.obj -MD -MP -MF $(DEPDIR)/libcommon_a-xreadline.Tpo -c -o libcommon_a-xreadline.obj `if test -f 'xreadline.c'; then $(CYGPATH_W) 'xreadline.c'; else $(CYGPATH_W) '$(srcdir)/xreadline.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-xreadline.Tpo $(DEPDIR)/libcommon_a-xreadline.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xreadline.c' object='libcommon_a-xreadline.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-xreadline.obj `if test -f 'xreadline.c'; then $(CYGPATH_W) 'xreadline.c'; else $(CYGPATH_W) '$(srcdir)/xreadline.c'; fi`
+
+libcommon_a-membuf.o: membuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-membuf.o -MD -MP -MF $(DEPDIR)/libcommon_a-membuf.Tpo -c -o libcommon_a-membuf.o `test -f 'membuf.c' || echo '$(srcdir)/'`membuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-membuf.Tpo $(DEPDIR)/libcommon_a-membuf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='membuf.c' object='libcommon_a-membuf.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-membuf.o `test -f 'membuf.c' || echo '$(srcdir)/'`membuf.c
+
+libcommon_a-membuf.obj: membuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-membuf.obj -MD -MP -MF $(DEPDIR)/libcommon_a-membuf.Tpo -c -o libcommon_a-membuf.obj `if test -f 'membuf.c'; then $(CYGPATH_W) 'membuf.c'; else $(CYGPATH_W) '$(srcdir)/membuf.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-membuf.Tpo $(DEPDIR)/libcommon_a-membuf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='membuf.c' object='libcommon_a-membuf.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-membuf.obj `if test -f 'membuf.c'; then $(CYGPATH_W) 'membuf.c'; else $(CYGPATH_W) '$(srcdir)/membuf.c'; fi`
+
+libcommon_a-iobuf.o: iobuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-iobuf.o -MD -MP -MF $(DEPDIR)/libcommon_a-iobuf.Tpo -c -o libcommon_a-iobuf.o `test -f 'iobuf.c' || echo '$(srcdir)/'`iobuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-iobuf.Tpo $(DEPDIR)/libcommon_a-iobuf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iobuf.c' object='libcommon_a-iobuf.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-iobuf.o `test -f 'iobuf.c' || echo '$(srcdir)/'`iobuf.c
+
+libcommon_a-iobuf.obj: iobuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-iobuf.obj -MD -MP -MF $(DEPDIR)/libcommon_a-iobuf.Tpo -c -o libcommon_a-iobuf.obj `if test -f 'iobuf.c'; then $(CYGPATH_W) 'iobuf.c'; else $(CYGPATH_W) '$(srcdir)/iobuf.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-iobuf.Tpo $(DEPDIR)/libcommon_a-iobuf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iobuf.c' object='libcommon_a-iobuf.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-iobuf.obj `if test -f 'iobuf.c'; then $(CYGPATH_W) 'iobuf.c'; else $(CYGPATH_W) '$(srcdir)/iobuf.c'; fi`
+
+libcommon_a-ttyio.o: ttyio.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-ttyio.o -MD -MP -MF $(DEPDIR)/libcommon_a-ttyio.Tpo -c -o libcommon_a-ttyio.o `test -f 'ttyio.c' || echo '$(srcdir)/'`ttyio.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-ttyio.Tpo $(DEPDIR)/libcommon_a-ttyio.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ttyio.c' object='libcommon_a-ttyio.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-ttyio.o `test -f 'ttyio.c' || echo '$(srcdir)/'`ttyio.c
+
+libcommon_a-ttyio.obj: ttyio.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-ttyio.obj -MD -MP -MF $(DEPDIR)/libcommon_a-ttyio.Tpo -c -o libcommon_a-ttyio.obj `if test -f 'ttyio.c'; then $(CYGPATH_W) 'ttyio.c'; else $(CYGPATH_W) '$(srcdir)/ttyio.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-ttyio.Tpo $(DEPDIR)/libcommon_a-ttyio.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ttyio.c' object='libcommon_a-ttyio.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-ttyio.obj `if test -f 'ttyio.c'; then $(CYGPATH_W) 'ttyio.c'; else $(CYGPATH_W) '$(srcdir)/ttyio.c'; fi`
+
+libcommon_a-asshelp.o: asshelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-asshelp.o -MD -MP -MF $(DEPDIR)/libcommon_a-asshelp.Tpo -c -o libcommon_a-asshelp.o `test -f 'asshelp.c' || echo '$(srcdir)/'`asshelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-asshelp.Tpo $(DEPDIR)/libcommon_a-asshelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp.c' object='libcommon_a-asshelp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-asshelp.o `test -f 'asshelp.c' || echo '$(srcdir)/'`asshelp.c
+
+libcommon_a-asshelp.obj: asshelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-asshelp.obj -MD -MP -MF $(DEPDIR)/libcommon_a-asshelp.Tpo -c -o libcommon_a-asshelp.obj `if test -f 'asshelp.c'; then $(CYGPATH_W) 'asshelp.c'; else $(CYGPATH_W) '$(srcdir)/asshelp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-asshelp.Tpo $(DEPDIR)/libcommon_a-asshelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp.c' object='libcommon_a-asshelp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-asshelp.obj `if test -f 'asshelp.c'; then $(CYGPATH_W) 'asshelp.c'; else $(CYGPATH_W) '$(srcdir)/asshelp.c'; fi`
+
+libcommon_a-asshelp2.o: asshelp2.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-asshelp2.o -MD -MP -MF $(DEPDIR)/libcommon_a-asshelp2.Tpo -c -o libcommon_a-asshelp2.o `test -f 'asshelp2.c' || echo '$(srcdir)/'`asshelp2.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-asshelp2.Tpo $(DEPDIR)/libcommon_a-asshelp2.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp2.c' object='libcommon_a-asshelp2.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-asshelp2.o `test -f 'asshelp2.c' || echo '$(srcdir)/'`asshelp2.c
+
+libcommon_a-asshelp2.obj: asshelp2.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-asshelp2.obj -MD -MP -MF $(DEPDIR)/libcommon_a-asshelp2.Tpo -c -o libcommon_a-asshelp2.obj `if test -f 'asshelp2.c'; then $(CYGPATH_W) 'asshelp2.c'; else $(CYGPATH_W) '$(srcdir)/asshelp2.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-asshelp2.Tpo $(DEPDIR)/libcommon_a-asshelp2.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp2.c' object='libcommon_a-asshelp2.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-asshelp2.obj `if test -f 'asshelp2.c'; then $(CYGPATH_W) 'asshelp2.c'; else $(CYGPATH_W) '$(srcdir)/asshelp2.c'; fi`
+
+libcommon_a-signal.o: signal.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-signal.o -MD -MP -MF $(DEPDIR)/libcommon_a-signal.Tpo -c -o libcommon_a-signal.o `test -f 'signal.c' || echo '$(srcdir)/'`signal.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-signal.Tpo $(DEPDIR)/libcommon_a-signal.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signal.c' object='libcommon_a-signal.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-signal.o `test -f 'signal.c' || echo '$(srcdir)/'`signal.c
+
+libcommon_a-signal.obj: signal.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-signal.obj -MD -MP -MF $(DEPDIR)/libcommon_a-signal.Tpo -c -o libcommon_a-signal.obj `if test -f 'signal.c'; then $(CYGPATH_W) 'signal.c'; else $(CYGPATH_W) '$(srcdir)/signal.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-signal.Tpo $(DEPDIR)/libcommon_a-signal.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signal.c' object='libcommon_a-signal.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-signal.obj `if test -f 'signal.c'; then $(CYGPATH_W) 'signal.c'; else $(CYGPATH_W) '$(srcdir)/signal.c'; fi`
+
+libcommon_a-audit.o: audit.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-audit.o -MD -MP -MF $(DEPDIR)/libcommon_a-audit.Tpo -c -o libcommon_a-audit.o `test -f 'audit.c' || echo '$(srcdir)/'`audit.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-audit.Tpo $(DEPDIR)/libcommon_a-audit.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='audit.c' object='libcommon_a-audit.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-audit.o `test -f 'audit.c' || echo '$(srcdir)/'`audit.c
+
+libcommon_a-audit.obj: audit.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-audit.obj -MD -MP -MF $(DEPDIR)/libcommon_a-audit.Tpo -c -o libcommon_a-audit.obj `if test -f 'audit.c'; then $(CYGPATH_W) 'audit.c'; else $(CYGPATH_W) '$(srcdir)/audit.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-audit.Tpo $(DEPDIR)/libcommon_a-audit.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='audit.c' object='libcommon_a-audit.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-audit.obj `if test -f 'audit.c'; then $(CYGPATH_W) 'audit.c'; else $(CYGPATH_W) '$(srcdir)/audit.c'; fi`
+
+libcommon_a-localename.o: localename.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-localename.o -MD -MP -MF $(DEPDIR)/libcommon_a-localename.Tpo -c -o libcommon_a-localename.o `test -f 'localename.c' || echo '$(srcdir)/'`localename.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-localename.Tpo $(DEPDIR)/libcommon_a-localename.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='localename.c' object='libcommon_a-localename.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-localename.o `test -f 'localename.c' || echo '$(srcdir)/'`localename.c
+
+libcommon_a-localename.obj: localename.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-localename.obj -MD -MP -MF $(DEPDIR)/libcommon_a-localename.Tpo -c -o libcommon_a-localename.obj `if test -f 'localename.c'; then $(CYGPATH_W) 'localename.c'; else $(CYGPATH_W) '$(srcdir)/localename.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-localename.Tpo $(DEPDIR)/libcommon_a-localename.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='localename.c' object='libcommon_a-localename.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-localename.obj `if test -f 'localename.c'; then $(CYGPATH_W) 'localename.c'; else $(CYGPATH_W) '$(srcdir)/localename.c'; fi`
+
+libcommon_a-session-env.o: session-env.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-session-env.o -MD -MP -MF $(DEPDIR)/libcommon_a-session-env.Tpo -c -o libcommon_a-session-env.o `test -f 'session-env.c' || echo '$(srcdir)/'`session-env.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-session-env.Tpo $(DEPDIR)/libcommon_a-session-env.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='session-env.c' object='libcommon_a-session-env.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-session-env.o `test -f 'session-env.c' || echo '$(srcdir)/'`session-env.c
+
+libcommon_a-session-env.obj: session-env.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-session-env.obj -MD -MP -MF $(DEPDIR)/libcommon_a-session-env.Tpo -c -o libcommon_a-session-env.obj `if test -f 'session-env.c'; then $(CYGPATH_W) 'session-env.c'; else $(CYGPATH_W) '$(srcdir)/session-env.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-session-env.Tpo $(DEPDIR)/libcommon_a-session-env.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='session-env.c' object='libcommon_a-session-env.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-session-env.obj `if test -f 'session-env.c'; then $(CYGPATH_W) 'session-env.c'; else $(CYGPATH_W) '$(srcdir)/session-env.c'; fi`
+
+libcommon_a-userids.o: userids.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-userids.o -MD -MP -MF $(DEPDIR)/libcommon_a-userids.Tpo -c -o libcommon_a-userids.o `test -f 'userids.c' || echo '$(srcdir)/'`userids.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-userids.Tpo $(DEPDIR)/libcommon_a-userids.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='userids.c' object='libcommon_a-userids.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-userids.o `test -f 'userids.c' || echo '$(srcdir)/'`userids.c
+
+libcommon_a-userids.obj: userids.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-userids.obj -MD -MP -MF $(DEPDIR)/libcommon_a-userids.Tpo -c -o libcommon_a-userids.obj `if test -f 'userids.c'; then $(CYGPATH_W) 'userids.c'; else $(CYGPATH_W) '$(srcdir)/userids.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-userids.Tpo $(DEPDIR)/libcommon_a-userids.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='userids.c' object='libcommon_a-userids.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-userids.obj `if test -f 'userids.c'; then $(CYGPATH_W) 'userids.c'; else $(CYGPATH_W) '$(srcdir)/userids.c'; fi`
+
+libcommon_a-openpgp-oid.o: openpgp-oid.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-openpgp-oid.o -MD -MP -MF $(DEPDIR)/libcommon_a-openpgp-oid.Tpo -c -o libcommon_a-openpgp-oid.o `test -f 'openpgp-oid.c' || echo '$(srcdir)/'`openpgp-oid.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-openpgp-oid.Tpo $(DEPDIR)/libcommon_a-openpgp-oid.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='openpgp-oid.c' object='libcommon_a-openpgp-oid.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-openpgp-oid.o `test -f 'openpgp-oid.c' || echo '$(srcdir)/'`openpgp-oid.c
+
+libcommon_a-openpgp-oid.obj: openpgp-oid.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-openpgp-oid.obj -MD -MP -MF $(DEPDIR)/libcommon_a-openpgp-oid.Tpo -c -o libcommon_a-openpgp-oid.obj `if test -f 'openpgp-oid.c'; then $(CYGPATH_W) 'openpgp-oid.c'; else $(CYGPATH_W) '$(srcdir)/openpgp-oid.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-openpgp-oid.Tpo $(DEPDIR)/libcommon_a-openpgp-oid.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='openpgp-oid.c' object='libcommon_a-openpgp-oid.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-openpgp-oid.obj `if test -f 'openpgp-oid.c'; then $(CYGPATH_W) 'openpgp-oid.c'; else $(CYGPATH_W) '$(srcdir)/openpgp-oid.c'; fi`
+
+libcommon_a-ssh-utils.o: ssh-utils.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-ssh-utils.o -MD -MP -MF $(DEPDIR)/libcommon_a-ssh-utils.Tpo -c -o libcommon_a-ssh-utils.o `test -f 'ssh-utils.c' || echo '$(srcdir)/'`ssh-utils.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-ssh-utils.Tpo $(DEPDIR)/libcommon_a-ssh-utils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ssh-utils.c' object='libcommon_a-ssh-utils.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-ssh-utils.o `test -f 'ssh-utils.c' || echo '$(srcdir)/'`ssh-utils.c
+
+libcommon_a-ssh-utils.obj: ssh-utils.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-ssh-utils.obj -MD -MP -MF $(DEPDIR)/libcommon_a-ssh-utils.Tpo -c -o libcommon_a-ssh-utils.obj `if test -f 'ssh-utils.c'; then $(CYGPATH_W) 'ssh-utils.c'; else $(CYGPATH_W) '$(srcdir)/ssh-utils.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-ssh-utils.Tpo $(DEPDIR)/libcommon_a-ssh-utils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ssh-utils.c' object='libcommon_a-ssh-utils.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-ssh-utils.obj `if test -f 'ssh-utils.c'; then $(CYGPATH_W) 'ssh-utils.c'; else $(CYGPATH_W) '$(srcdir)/ssh-utils.c'; fi`
+
+libcommon_a-agent-opt.o: agent-opt.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-agent-opt.o -MD -MP -MF $(DEPDIR)/libcommon_a-agent-opt.Tpo -c -o libcommon_a-agent-opt.o `test -f 'agent-opt.c' || echo '$(srcdir)/'`agent-opt.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-agent-opt.Tpo $(DEPDIR)/libcommon_a-agent-opt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='agent-opt.c' object='libcommon_a-agent-opt.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-agent-opt.o `test -f 'agent-opt.c' || echo '$(srcdir)/'`agent-opt.c
+
+libcommon_a-agent-opt.obj: agent-opt.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-agent-opt.obj -MD -MP -MF $(DEPDIR)/libcommon_a-agent-opt.Tpo -c -o libcommon_a-agent-opt.obj `if test -f 'agent-opt.c'; then $(CYGPATH_W) 'agent-opt.c'; else $(CYGPATH_W) '$(srcdir)/agent-opt.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-agent-opt.Tpo $(DEPDIR)/libcommon_a-agent-opt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='agent-opt.c' object='libcommon_a-agent-opt.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-agent-opt.obj `if test -f 'agent-opt.c'; then $(CYGPATH_W) 'agent-opt.c'; else $(CYGPATH_W) '$(srcdir)/agent-opt.c'; fi`
+
+libcommon_a-helpfile.o: helpfile.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-helpfile.o -MD -MP -MF $(DEPDIR)/libcommon_a-helpfile.Tpo -c -o libcommon_a-helpfile.o `test -f 'helpfile.c' || echo '$(srcdir)/'`helpfile.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-helpfile.Tpo $(DEPDIR)/libcommon_a-helpfile.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='helpfile.c' object='libcommon_a-helpfile.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-helpfile.o `test -f 'helpfile.c' || echo '$(srcdir)/'`helpfile.c
+
+libcommon_a-helpfile.obj: helpfile.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-helpfile.obj -MD -MP -MF $(DEPDIR)/libcommon_a-helpfile.Tpo -c -o libcommon_a-helpfile.obj `if test -f 'helpfile.c'; then $(CYGPATH_W) 'helpfile.c'; else $(CYGPATH_W) '$(srcdir)/helpfile.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-helpfile.Tpo $(DEPDIR)/libcommon_a-helpfile.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='helpfile.c' object='libcommon_a-helpfile.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-helpfile.obj `if test -f 'helpfile.c'; then $(CYGPATH_W) 'helpfile.c'; else $(CYGPATH_W) '$(srcdir)/helpfile.c'; fi`
+
+libcommon_a-mkdir_p.o: mkdir_p.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-mkdir_p.o -MD -MP -MF $(DEPDIR)/libcommon_a-mkdir_p.Tpo -c -o libcommon_a-mkdir_p.o `test -f 'mkdir_p.c' || echo '$(srcdir)/'`mkdir_p.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-mkdir_p.Tpo $(DEPDIR)/libcommon_a-mkdir_p.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mkdir_p.c' object='libcommon_a-mkdir_p.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-mkdir_p.o `test -f 'mkdir_p.c' || echo '$(srcdir)/'`mkdir_p.c
+
+libcommon_a-mkdir_p.obj: mkdir_p.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-mkdir_p.obj -MD -MP -MF $(DEPDIR)/libcommon_a-mkdir_p.Tpo -c -o libcommon_a-mkdir_p.obj `if test -f 'mkdir_p.c'; then $(CYGPATH_W) 'mkdir_p.c'; else $(CYGPATH_W) '$(srcdir)/mkdir_p.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-mkdir_p.Tpo $(DEPDIR)/libcommon_a-mkdir_p.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mkdir_p.c' object='libcommon_a-mkdir_p.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-mkdir_p.obj `if test -f 'mkdir_p.c'; then $(CYGPATH_W) 'mkdir_p.c'; else $(CYGPATH_W) '$(srcdir)/mkdir_p.c'; fi`
+
++libcommon_a-call-gpg.o: call-gpg.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-call-gpg.o -MD -MP -MF $(DEPDIR)/libcommon_a-call-gpg.Tpo -c -o libcommon_a-call-gpg.o `test -f 'call-gpg.c' || echo '$(srcdir)/'`call-gpg.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-call-gpg.Tpo $(DEPDIR)/libcommon_a-call-gpg.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='call-gpg.c' object='libcommon_a-call-gpg.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-call-gpg.o `test -f 'call-gpg.c' || echo '$(srcdir)/'`call-gpg.c
++
++libcommon_a-call-gpg.obj: call-gpg.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-call-gpg.obj -MD -MP -MF $(DEPDIR)/libcommon_a-call-gpg.Tpo -c -o libcommon_a-call-gpg.obj `if test -f 'call-gpg.c'; then $(CYGPATH_W) 'call-gpg.c'; else $(CYGPATH_W) '$(srcdir)/call-gpg.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-call-gpg.Tpo $(DEPDIR)/libcommon_a-call-gpg.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='call-gpg.c' object='libcommon_a-call-gpg.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-call-gpg.obj `if test -f 'call-gpg.c'; then $(CYGPATH_W) 'call-gpg.c'; else $(CYGPATH_W) '$(srcdir)/call-gpg.c'; fi`
++
+libcommon_a-w32-reg.o: w32-reg.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-w32-reg.o -MD -MP -MF $(DEPDIR)/libcommon_a-w32-reg.Tpo -c -o libcommon_a-w32-reg.o `test -f 'w32-reg.c' || echo '$(srcdir)/'`w32-reg.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-w32-reg.Tpo $(DEPDIR)/libcommon_a-w32-reg.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='w32-reg.c' object='libcommon_a-w32-reg.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-w32-reg.o `test -f 'w32-reg.c' || echo '$(srcdir)/'`w32-reg.c
+
+libcommon_a-w32-reg.obj: w32-reg.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-w32-reg.obj -MD -MP -MF $(DEPDIR)/libcommon_a-w32-reg.Tpo -c -o libcommon_a-w32-reg.obj `if test -f 'w32-reg.c'; then $(CYGPATH_W) 'w32-reg.c'; else $(CYGPATH_W) '$(srcdir)/w32-reg.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-w32-reg.Tpo $(DEPDIR)/libcommon_a-w32-reg.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='w32-reg.c' object='libcommon_a-w32-reg.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-w32-reg.obj `if test -f 'w32-reg.c'; then $(CYGPATH_W) 'w32-reg.c'; else $(CYGPATH_W) '$(srcdir)/w32-reg.c'; fi`
+
+libcommon_a-w32-afunix.o: w32-afunix.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-w32-afunix.o -MD -MP -MF $(DEPDIR)/libcommon_a-w32-afunix.Tpo -c -o libcommon_a-w32-afunix.o `test -f 'w32-afunix.c' || echo '$(srcdir)/'`w32-afunix.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-w32-afunix.Tpo $(DEPDIR)/libcommon_a-w32-afunix.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='w32-afunix.c' object='libcommon_a-w32-afunix.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-w32-afunix.o `test -f 'w32-afunix.c' || echo '$(srcdir)/'`w32-afunix.c
+
+libcommon_a-w32-afunix.obj: w32-afunix.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-w32-afunix.obj -MD -MP -MF $(DEPDIR)/libcommon_a-w32-afunix.Tpo -c -o libcommon_a-w32-afunix.obj `if test -f 'w32-afunix.c'; then $(CYGPATH_W) 'w32-afunix.c'; else $(CYGPATH_W) '$(srcdir)/w32-afunix.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-w32-afunix.Tpo $(DEPDIR)/libcommon_a-w32-afunix.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='w32-afunix.c' object='libcommon_a-w32-afunix.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-w32-afunix.obj `if test -f 'w32-afunix.c'; then $(CYGPATH_W) 'w32-afunix.c'; else $(CYGPATH_W) '$(srcdir)/w32-afunix.c'; fi`
+
+libcommon_a-exechelp-w32ce.o: exechelp-w32ce.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-exechelp-w32ce.o -MD -MP -MF $(DEPDIR)/libcommon_a-exechelp-w32ce.Tpo -c -o libcommon_a-exechelp-w32ce.o `test -f 'exechelp-w32ce.c' || echo '$(srcdir)/'`exechelp-w32ce.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-exechelp-w32ce.Tpo $(DEPDIR)/libcommon_a-exechelp-w32ce.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-w32ce.c' object='libcommon_a-exechelp-w32ce.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-exechelp-w32ce.o `test -f 'exechelp-w32ce.c' || echo '$(srcdir)/'`exechelp-w32ce.c
+
+libcommon_a-exechelp-w32ce.obj: exechelp-w32ce.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-exechelp-w32ce.obj -MD -MP -MF $(DEPDIR)/libcommon_a-exechelp-w32ce.Tpo -c -o libcommon_a-exechelp-w32ce.obj `if test -f 'exechelp-w32ce.c'; then $(CYGPATH_W) 'exechelp-w32ce.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32ce.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-exechelp-w32ce.Tpo $(DEPDIR)/libcommon_a-exechelp-w32ce.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-w32ce.c' object='libcommon_a-exechelp-w32ce.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-exechelp-w32ce.obj `if test -f 'exechelp-w32ce.c'; then $(CYGPATH_W) 'exechelp-w32ce.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32ce.c'; fi`
+
+libcommon_a-exechelp-w32.o: exechelp-w32.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-exechelp-w32.o -MD -MP -MF $(DEPDIR)/libcommon_a-exechelp-w32.Tpo -c -o libcommon_a-exechelp-w32.o `test -f 'exechelp-w32.c' || echo '$(srcdir)/'`exechelp-w32.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-exechelp-w32.Tpo $(DEPDIR)/libcommon_a-exechelp-w32.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-w32.c' object='libcommon_a-exechelp-w32.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-exechelp-w32.o `test -f 'exechelp-w32.c' || echo '$(srcdir)/'`exechelp-w32.c
+
+libcommon_a-exechelp-w32.obj: exechelp-w32.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-exechelp-w32.obj -MD -MP -MF $(DEPDIR)/libcommon_a-exechelp-w32.Tpo -c -o libcommon_a-exechelp-w32.obj `if test -f 'exechelp-w32.c'; then $(CYGPATH_W) 'exechelp-w32.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-exechelp-w32.Tpo $(DEPDIR)/libcommon_a-exechelp-w32.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-w32.c' object='libcommon_a-exechelp-w32.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-exechelp-w32.obj `if test -f 'exechelp-w32.c'; then $(CYGPATH_W) 'exechelp-w32.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32.c'; fi`
+
+libcommon_a-exechelp-posix.o: exechelp-posix.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-exechelp-posix.o -MD -MP -MF $(DEPDIR)/libcommon_a-exechelp-posix.Tpo -c -o libcommon_a-exechelp-posix.o `test -f 'exechelp-posix.c' || echo '$(srcdir)/'`exechelp-posix.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-exechelp-posix.Tpo $(DEPDIR)/libcommon_a-exechelp-posix.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-posix.c' object='libcommon_a-exechelp-posix.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-exechelp-posix.o `test -f 'exechelp-posix.c' || echo '$(srcdir)/'`exechelp-posix.c
+
+libcommon_a-exechelp-posix.obj: exechelp-posix.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-exechelp-posix.obj -MD -MP -MF $(DEPDIR)/libcommon_a-exechelp-posix.Tpo -c -o libcommon_a-exechelp-posix.obj `if test -f 'exechelp-posix.c'; then $(CYGPATH_W) 'exechelp-posix.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-posix.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-exechelp-posix.Tpo $(DEPDIR)/libcommon_a-exechelp-posix.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-posix.c' object='libcommon_a-exechelp-posix.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-exechelp-posix.obj `if test -f 'exechelp-posix.c'; then $(CYGPATH_W) 'exechelp-posix.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-posix.c'; fi`
+
+libcommon_a-get-passphrase.o: get-passphrase.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-get-passphrase.o -MD -MP -MF $(DEPDIR)/libcommon_a-get-passphrase.Tpo -c -o libcommon_a-get-passphrase.o `test -f 'get-passphrase.c' || echo '$(srcdir)/'`get-passphrase.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-get-passphrase.Tpo $(DEPDIR)/libcommon_a-get-passphrase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='get-passphrase.c' object='libcommon_a-get-passphrase.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-get-passphrase.o `test -f 'get-passphrase.c' || echo '$(srcdir)/'`get-passphrase.c
+
+libcommon_a-get-passphrase.obj: get-passphrase.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-get-passphrase.obj -MD -MP -MF $(DEPDIR)/libcommon_a-get-passphrase.Tpo -c -o libcommon_a-get-passphrase.obj `if test -f 'get-passphrase.c'; then $(CYGPATH_W) 'get-passphrase.c'; else $(CYGPATH_W) '$(srcdir)/get-passphrase.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-get-passphrase.Tpo $(DEPDIR)/libcommon_a-get-passphrase.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='get-passphrase.c' object='libcommon_a-get-passphrase.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-get-passphrase.obj `if test -f 'get-passphrase.c'; then $(CYGPATH_W) 'get-passphrase.c'; else $(CYGPATH_W) '$(srcdir)/get-passphrase.c'; fi`
+
- libcommon_a-srv.o: srv.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-srv.o -MD -MP -MF $(DEPDIR)/libcommon_a-srv.Tpo -c -o libcommon_a-srv.o `test -f 'srv.c' || echo '$(srcdir)/'`srv.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-srv.Tpo $(DEPDIR)/libcommon_a-srv.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='srv.c' object='libcommon_a-srv.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-srv.o `test -f 'srv.c' || echo '$(srcdir)/'`srv.c
-
- libcommon_a-srv.obj: srv.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-srv.obj -MD -MP -MF $(DEPDIR)/libcommon_a-srv.Tpo -c -o libcommon_a-srv.obj `if test -f 'srv.c'; then $(CYGPATH_W) 'srv.c'; else $(CYGPATH_W) '$(srcdir)/srv.c'; fi`
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-srv.Tpo $(DEPDIR)/libcommon_a-srv.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='srv.c' object='libcommon_a-srv.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-srv.obj `if test -f 'srv.c'; then $(CYGPATH_W) 'srv.c'; else $(CYGPATH_W) '$(srcdir)/srv.c'; fi`
-
+libcommonpth_a-i18n.o: i18n.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-i18n.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-i18n.Tpo -c -o libcommonpth_a-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-i18n.Tpo $(DEPDIR)/libcommonpth_a-i18n.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='i18n.c' object='libcommonpth_a-i18n.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+
+libcommonpth_a-i18n.obj: i18n.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-i18n.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-i18n.Tpo -c -o libcommonpth_a-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-i18n.Tpo $(DEPDIR)/libcommonpth_a-i18n.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='i18n.c' object='libcommonpth_a-i18n.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+
+libcommonpth_a-mapstrings.o: mapstrings.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-mapstrings.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-mapstrings.Tpo -c -o libcommonpth_a-mapstrings.o `test -f 'mapstrings.c' || echo '$(srcdir)/'`mapstrings.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-mapstrings.Tpo $(DEPDIR)/libcommonpth_a-mapstrings.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mapstrings.c' object='libcommonpth_a-mapstrings.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-mapstrings.o `test -f 'mapstrings.c' || echo '$(srcdir)/'`mapstrings.c
+
+libcommonpth_a-mapstrings.obj: mapstrings.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-mapstrings.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-mapstrings.Tpo -c -o libcommonpth_a-mapstrings.obj `if test -f 'mapstrings.c'; then $(CYGPATH_W) 'mapstrings.c'; else $(CYGPATH_W) '$(srcdir)/mapstrings.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-mapstrings.Tpo $(DEPDIR)/libcommonpth_a-mapstrings.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mapstrings.c' object='libcommonpth_a-mapstrings.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-mapstrings.obj `if test -f 'mapstrings.c'; then $(CYGPATH_W) 'mapstrings.c'; else $(CYGPATH_W) '$(srcdir)/mapstrings.c'; fi`
+
+libcommonpth_a-stringhelp.o: stringhelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-stringhelp.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-stringhelp.Tpo -c -o libcommonpth_a-stringhelp.o `test -f 'stringhelp.c' || echo '$(srcdir)/'`stringhelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-stringhelp.Tpo $(DEPDIR)/libcommonpth_a-stringhelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stringhelp.c' object='libcommonpth_a-stringhelp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-stringhelp.o `test -f 'stringhelp.c' || echo '$(srcdir)/'`stringhelp.c
+
+libcommonpth_a-stringhelp.obj: stringhelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-stringhelp.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-stringhelp.Tpo -c -o libcommonpth_a-stringhelp.obj `if test -f 'stringhelp.c'; then $(CYGPATH_W) 'stringhelp.c'; else $(CYGPATH_W) '$(srcdir)/stringhelp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-stringhelp.Tpo $(DEPDIR)/libcommonpth_a-stringhelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stringhelp.c' object='libcommonpth_a-stringhelp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-stringhelp.obj `if test -f 'stringhelp.c'; then $(CYGPATH_W) 'stringhelp.c'; else $(CYGPATH_W) '$(srcdir)/stringhelp.c'; fi`
+
+libcommonpth_a-strlist.o: strlist.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-strlist.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-strlist.Tpo -c -o libcommonpth_a-strlist.o `test -f 'strlist.c' || echo '$(srcdir)/'`strlist.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-strlist.Tpo $(DEPDIR)/libcommonpth_a-strlist.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strlist.c' object='libcommonpth_a-strlist.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-strlist.o `test -f 'strlist.c' || echo '$(srcdir)/'`strlist.c
+
+libcommonpth_a-strlist.obj: strlist.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-strlist.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-strlist.Tpo -c -o libcommonpth_a-strlist.obj `if test -f 'strlist.c'; then $(CYGPATH_W) 'strlist.c'; else $(CYGPATH_W) '$(srcdir)/strlist.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-strlist.Tpo $(DEPDIR)/libcommonpth_a-strlist.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strlist.c' object='libcommonpth_a-strlist.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-strlist.obj `if test -f 'strlist.c'; then $(CYGPATH_W) 'strlist.c'; else $(CYGPATH_W) '$(srcdir)/strlist.c'; fi`
+
+libcommonpth_a-utf8conv.o: utf8conv.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-utf8conv.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-utf8conv.Tpo -c -o libcommonpth_a-utf8conv.o `test -f 'utf8conv.c' || echo '$(srcdir)/'`utf8conv.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-utf8conv.Tpo $(DEPDIR)/libcommonpth_a-utf8conv.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utf8conv.c' object='libcommonpth_a-utf8conv.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-utf8conv.o `test -f 'utf8conv.c' || echo '$(srcdir)/'`utf8conv.c
+
+libcommonpth_a-utf8conv.obj: utf8conv.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-utf8conv.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-utf8conv.Tpo -c -o libcommonpth_a-utf8conv.obj `if test -f 'utf8conv.c'; then $(CYGPATH_W) 'utf8conv.c'; else $(CYGPATH_W) '$(srcdir)/utf8conv.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-utf8conv.Tpo $(DEPDIR)/libcommonpth_a-utf8conv.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utf8conv.c' object='libcommonpth_a-utf8conv.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-utf8conv.obj `if test -f 'utf8conv.c'; then $(CYGPATH_W) 'utf8conv.c'; else $(CYGPATH_W) '$(srcdir)/utf8conv.c'; fi`
+
+libcommonpth_a-argparse.o: argparse.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-argparse.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-argparse.Tpo -c -o libcommonpth_a-argparse.o `test -f 'argparse.c' || echo '$(srcdir)/'`argparse.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-argparse.Tpo $(DEPDIR)/libcommonpth_a-argparse.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='argparse.c' object='libcommonpth_a-argparse.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-argparse.o `test -f 'argparse.c' || echo '$(srcdir)/'`argparse.c
+
+libcommonpth_a-argparse.obj: argparse.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-argparse.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-argparse.Tpo -c -o libcommonpth_a-argparse.obj `if test -f 'argparse.c'; then $(CYGPATH_W) 'argparse.c'; else $(CYGPATH_W) '$(srcdir)/argparse.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-argparse.Tpo $(DEPDIR)/libcommonpth_a-argparse.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='argparse.c' object='libcommonpth_a-argparse.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-argparse.obj `if test -f 'argparse.c'; then $(CYGPATH_W) 'argparse.c'; else $(CYGPATH_W) '$(srcdir)/argparse.c'; fi`
+
+libcommonpth_a-logging.o: logging.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-logging.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-logging.Tpo -c -o libcommonpth_a-logging.o `test -f 'logging.c' || echo '$(srcdir)/'`logging.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-logging.Tpo $(DEPDIR)/libcommonpth_a-logging.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='logging.c' object='libcommonpth_a-logging.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-logging.o `test -f 'logging.c' || echo '$(srcdir)/'`logging.c
+
+libcommonpth_a-logging.obj: logging.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-logging.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-logging.Tpo -c -o libcommonpth_a-logging.obj `if test -f 'logging.c'; then $(CYGPATH_W) 'logging.c'; else $(CYGPATH_W) '$(srcdir)/logging.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-logging.Tpo $(DEPDIR)/libcommonpth_a-logging.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='logging.c' object='libcommonpth_a-logging.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-logging.obj `if test -f 'logging.c'; then $(CYGPATH_W) 'logging.c'; else $(CYGPATH_W) '$(srcdir)/logging.c'; fi`
+
+libcommonpth_a-dotlock.o: dotlock.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-dotlock.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-dotlock.Tpo -c -o libcommonpth_a-dotlock.o `test -f 'dotlock.c' || echo '$(srcdir)/'`dotlock.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-dotlock.Tpo $(DEPDIR)/libcommonpth_a-dotlock.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dotlock.c' object='libcommonpth_a-dotlock.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-dotlock.o `test -f 'dotlock.c' || echo '$(srcdir)/'`dotlock.c
+
+libcommonpth_a-dotlock.obj: dotlock.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-dotlock.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-dotlock.Tpo -c -o libcommonpth_a-dotlock.obj `if test -f 'dotlock.c'; then $(CYGPATH_W) 'dotlock.c'; else $(CYGPATH_W) '$(srcdir)/dotlock.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-dotlock.Tpo $(DEPDIR)/libcommonpth_a-dotlock.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dotlock.c' object='libcommonpth_a-dotlock.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-dotlock.obj `if test -f 'dotlock.c'; then $(CYGPATH_W) 'dotlock.c'; else $(CYGPATH_W) '$(srcdir)/dotlock.c'; fi`
+
+libcommonpth_a-mischelp.o: mischelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-mischelp.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-mischelp.Tpo -c -o libcommonpth_a-mischelp.o `test -f 'mischelp.c' || echo '$(srcdir)/'`mischelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-mischelp.Tpo $(DEPDIR)/libcommonpth_a-mischelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mischelp.c' object='libcommonpth_a-mischelp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-mischelp.o `test -f 'mischelp.c' || echo '$(srcdir)/'`mischelp.c
+
+libcommonpth_a-mischelp.obj: mischelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-mischelp.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-mischelp.Tpo -c -o libcommonpth_a-mischelp.obj `if test -f 'mischelp.c'; then $(CYGPATH_W) 'mischelp.c'; else $(CYGPATH_W) '$(srcdir)/mischelp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-mischelp.Tpo $(DEPDIR)/libcommonpth_a-mischelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mischelp.c' object='libcommonpth_a-mischelp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-mischelp.obj `if test -f 'mischelp.c'; then $(CYGPATH_W) 'mischelp.c'; else $(CYGPATH_W) '$(srcdir)/mischelp.c'; fi`
+
+libcommonpth_a-status.o: status.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-status.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-status.Tpo -c -o libcommonpth_a-status.o `test -f 'status.c' || echo '$(srcdir)/'`status.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-status.Tpo $(DEPDIR)/libcommonpth_a-status.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='status.c' object='libcommonpth_a-status.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-status.o `test -f 'status.c' || echo '$(srcdir)/'`status.c
+
+libcommonpth_a-status.obj: status.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-status.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-status.Tpo -c -o libcommonpth_a-status.obj `if test -f 'status.c'; then $(CYGPATH_W) 'status.c'; else $(CYGPATH_W) '$(srcdir)/status.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-status.Tpo $(DEPDIR)/libcommonpth_a-status.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='status.c' object='libcommonpth_a-status.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-status.obj `if test -f 'status.c'; then $(CYGPATH_W) 'status.c'; else $(CYGPATH_W) '$(srcdir)/status.c'; fi`
+
+libcommonpth_a-tlv.o: tlv.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-tlv.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-tlv.Tpo -c -o libcommonpth_a-tlv.o `test -f 'tlv.c' || echo '$(srcdir)/'`tlv.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-tlv.Tpo $(DEPDIR)/libcommonpth_a-tlv.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tlv.c' object='libcommonpth_a-tlv.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-tlv.o `test -f 'tlv.c' || echo '$(srcdir)/'`tlv.c
+
+libcommonpth_a-tlv.obj: tlv.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-tlv.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-tlv.Tpo -c -o libcommonpth_a-tlv.obj `if test -f 'tlv.c'; then $(CYGPATH_W) 'tlv.c'; else $(CYGPATH_W) '$(srcdir)/tlv.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-tlv.Tpo $(DEPDIR)/libcommonpth_a-tlv.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tlv.c' object='libcommonpth_a-tlv.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-tlv.obj `if test -f 'tlv.c'; then $(CYGPATH_W) 'tlv.c'; else $(CYGPATH_W) '$(srcdir)/tlv.c'; fi`
+
+libcommonpth_a-init.o: init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-init.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-init.Tpo -c -o libcommonpth_a-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-init.Tpo $(DEPDIR)/libcommonpth_a-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='init.c' object='libcommonpth_a-init.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c
+
+libcommonpth_a-init.obj: init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-init.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-init.Tpo -c -o libcommonpth_a-init.obj `if test -f 'init.c'; then $(CYGPATH_W) 'init.c'; else $(CYGPATH_W) '$(srcdir)/init.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-init.Tpo $(DEPDIR)/libcommonpth_a-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='init.c' object='libcommonpth_a-init.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-init.obj `if test -f 'init.c'; then $(CYGPATH_W) 'init.c'; else $(CYGPATH_W) '$(srcdir)/init.c'; fi`
+
+libcommonpth_a-sexputil.o: sexputil.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-sexputil.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-sexputil.Tpo -c -o libcommonpth_a-sexputil.o `test -f 'sexputil.c' || echo '$(srcdir)/'`sexputil.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-sexputil.Tpo $(DEPDIR)/libcommonpth_a-sexputil.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sexputil.c' object='libcommonpth_a-sexputil.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-sexputil.o `test -f 'sexputil.c' || echo '$(srcdir)/'`sexputil.c
+
+libcommonpth_a-sexputil.obj: sexputil.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-sexputil.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-sexputil.Tpo -c -o libcommonpth_a-sexputil.obj `if test -f 'sexputil.c'; then $(CYGPATH_W) 'sexputil.c'; else $(CYGPATH_W) '$(srcdir)/sexputil.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-sexputil.Tpo $(DEPDIR)/libcommonpth_a-sexputil.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sexputil.c' object='libcommonpth_a-sexputil.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-sexputil.obj `if test -f 'sexputil.c'; then $(CYGPATH_W) 'sexputil.c'; else $(CYGPATH_W) '$(srcdir)/sexputil.c'; fi`
+
+libcommonpth_a-sysutils.o: sysutils.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-sysutils.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-sysutils.Tpo -c -o libcommonpth_a-sysutils.o `test -f 'sysutils.c' || echo '$(srcdir)/'`sysutils.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-sysutils.Tpo $(DEPDIR)/libcommonpth_a-sysutils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sysutils.c' object='libcommonpth_a-sysutils.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-sysutils.o `test -f 'sysutils.c' || echo '$(srcdir)/'`sysutils.c
+
+libcommonpth_a-sysutils.obj: sysutils.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-sysutils.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-sysutils.Tpo -c -o libcommonpth_a-sysutils.obj `if test -f 'sysutils.c'; then $(CYGPATH_W) 'sysutils.c'; else $(CYGPATH_W) '$(srcdir)/sysutils.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-sysutils.Tpo $(DEPDIR)/libcommonpth_a-sysutils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sysutils.c' object='libcommonpth_a-sysutils.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-sysutils.obj `if test -f 'sysutils.c'; then $(CYGPATH_W) 'sysutils.c'; else $(CYGPATH_W) '$(srcdir)/sysutils.c'; fi`
+
+libcommonpth_a-homedir.o: homedir.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-homedir.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-homedir.Tpo -c -o libcommonpth_a-homedir.o `test -f 'homedir.c' || echo '$(srcdir)/'`homedir.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-homedir.Tpo $(DEPDIR)/libcommonpth_a-homedir.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='homedir.c' object='libcommonpth_a-homedir.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-homedir.o `test -f 'homedir.c' || echo '$(srcdir)/'`homedir.c
+
+libcommonpth_a-homedir.obj: homedir.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-homedir.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-homedir.Tpo -c -o libcommonpth_a-homedir.obj `if test -f 'homedir.c'; then $(CYGPATH_W) 'homedir.c'; else $(CYGPATH_W) '$(srcdir)/homedir.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-homedir.Tpo $(DEPDIR)/libcommonpth_a-homedir.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='homedir.c' object='libcommonpth_a-homedir.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-homedir.obj `if test -f 'homedir.c'; then $(CYGPATH_W) 'homedir.c'; else $(CYGPATH_W) '$(srcdir)/homedir.c'; fi`
+
+libcommonpth_a-gettime.o: gettime.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-gettime.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-gettime.Tpo -c -o libcommonpth_a-gettime.o `test -f 'gettime.c' || echo '$(srcdir)/'`gettime.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-gettime.Tpo $(DEPDIR)/libcommonpth_a-gettime.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gettime.c' object='libcommonpth_a-gettime.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-gettime.o `test -f 'gettime.c' || echo '$(srcdir)/'`gettime.c
+
+libcommonpth_a-gettime.obj: gettime.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-gettime.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-gettime.Tpo -c -o libcommonpth_a-gettime.obj `if test -f 'gettime.c'; then $(CYGPATH_W) 'gettime.c'; else $(CYGPATH_W) '$(srcdir)/gettime.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-gettime.Tpo $(DEPDIR)/libcommonpth_a-gettime.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gettime.c' object='libcommonpth_a-gettime.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-gettime.obj `if test -f 'gettime.c'; then $(CYGPATH_W) 'gettime.c'; else $(CYGPATH_W) '$(srcdir)/gettime.c'; fi`
+
+libcommonpth_a-yesno.o: yesno.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-yesno.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-yesno.Tpo -c -o libcommonpth_a-yesno.o `test -f 'yesno.c' || echo '$(srcdir)/'`yesno.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-yesno.Tpo $(DEPDIR)/libcommonpth_a-yesno.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='yesno.c' object='libcommonpth_a-yesno.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-yesno.o `test -f 'yesno.c' || echo '$(srcdir)/'`yesno.c
+
+libcommonpth_a-yesno.obj: yesno.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-yesno.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-yesno.Tpo -c -o libcommonpth_a-yesno.obj `if test -f 'yesno.c'; then $(CYGPATH_W) 'yesno.c'; else $(CYGPATH_W) '$(srcdir)/yesno.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-yesno.Tpo $(DEPDIR)/libcommonpth_a-yesno.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='yesno.c' object='libcommonpth_a-yesno.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-yesno.obj `if test -f 'yesno.c'; then $(CYGPATH_W) 'yesno.c'; else $(CYGPATH_W) '$(srcdir)/yesno.c'; fi`
+
+libcommonpth_a-b64enc.o: b64enc.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-b64enc.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-b64enc.Tpo -c -o libcommonpth_a-b64enc.o `test -f 'b64enc.c' || echo '$(srcdir)/'`b64enc.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-b64enc.Tpo $(DEPDIR)/libcommonpth_a-b64enc.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='b64enc.c' object='libcommonpth_a-b64enc.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-b64enc.o `test -f 'b64enc.c' || echo '$(srcdir)/'`b64enc.c
+
+libcommonpth_a-b64enc.obj: b64enc.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-b64enc.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-b64enc.Tpo -c -o libcommonpth_a-b64enc.obj `if test -f 'b64enc.c'; then $(CYGPATH_W) 'b64enc.c'; else $(CYGPATH_W) '$(srcdir)/b64enc.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-b64enc.Tpo $(DEPDIR)/libcommonpth_a-b64enc.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='b64enc.c' object='libcommonpth_a-b64enc.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-b64enc.obj `if test -f 'b64enc.c'; then $(CYGPATH_W) 'b64enc.c'; else $(CYGPATH_W) '$(srcdir)/b64enc.c'; fi`
+
+libcommonpth_a-b64dec.o: b64dec.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-b64dec.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-b64dec.Tpo -c -o libcommonpth_a-b64dec.o `test -f 'b64dec.c' || echo '$(srcdir)/'`b64dec.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-b64dec.Tpo $(DEPDIR)/libcommonpth_a-b64dec.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='b64dec.c' object='libcommonpth_a-b64dec.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-b64dec.o `test -f 'b64dec.c' || echo '$(srcdir)/'`b64dec.c
+
+libcommonpth_a-b64dec.obj: b64dec.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-b64dec.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-b64dec.Tpo -c -o libcommonpth_a-b64dec.obj `if test -f 'b64dec.c'; then $(CYGPATH_W) 'b64dec.c'; else $(CYGPATH_W) '$(srcdir)/b64dec.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-b64dec.Tpo $(DEPDIR)/libcommonpth_a-b64dec.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='b64dec.c' object='libcommonpth_a-b64dec.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-b64dec.obj `if test -f 'b64dec.c'; then $(CYGPATH_W) 'b64dec.c'; else $(CYGPATH_W) '$(srcdir)/b64dec.c'; fi`
+
+libcommonpth_a-zb32.o: zb32.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-zb32.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-zb32.Tpo -c -o libcommonpth_a-zb32.o `test -f 'zb32.c' || echo '$(srcdir)/'`zb32.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-zb32.Tpo $(DEPDIR)/libcommonpth_a-zb32.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='zb32.c' object='libcommonpth_a-zb32.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-zb32.o `test -f 'zb32.c' || echo '$(srcdir)/'`zb32.c
+
+libcommonpth_a-zb32.obj: zb32.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-zb32.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-zb32.Tpo -c -o libcommonpth_a-zb32.obj `if test -f 'zb32.c'; then $(CYGPATH_W) 'zb32.c'; else $(CYGPATH_W) '$(srcdir)/zb32.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-zb32.Tpo $(DEPDIR)/libcommonpth_a-zb32.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='zb32.c' object='libcommonpth_a-zb32.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-zb32.obj `if test -f 'zb32.c'; then $(CYGPATH_W) 'zb32.c'; else $(CYGPATH_W) '$(srcdir)/zb32.c'; fi`
+
+libcommonpth_a-convert.o: convert.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-convert.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-convert.Tpo -c -o libcommonpth_a-convert.o `test -f 'convert.c' || echo '$(srcdir)/'`convert.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-convert.Tpo $(DEPDIR)/libcommonpth_a-convert.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='convert.c' object='libcommonpth_a-convert.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-convert.o `test -f 'convert.c' || echo '$(srcdir)/'`convert.c
+
+libcommonpth_a-convert.obj: convert.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-convert.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-convert.Tpo -c -o libcommonpth_a-convert.obj `if test -f 'convert.c'; then $(CYGPATH_W) 'convert.c'; else $(CYGPATH_W) '$(srcdir)/convert.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-convert.Tpo $(DEPDIR)/libcommonpth_a-convert.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='convert.c' object='libcommonpth_a-convert.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-convert.obj `if test -f 'convert.c'; then $(CYGPATH_W) 'convert.c'; else $(CYGPATH_W) '$(srcdir)/convert.c'; fi`
+
+libcommonpth_a-percent.o: percent.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-percent.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-percent.Tpo -c -o libcommonpth_a-percent.o `test -f 'percent.c' || echo '$(srcdir)/'`percent.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-percent.Tpo $(DEPDIR)/libcommonpth_a-percent.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='percent.c' object='libcommonpth_a-percent.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-percent.o `test -f 'percent.c' || echo '$(srcdir)/'`percent.c
+
+libcommonpth_a-percent.obj: percent.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-percent.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-percent.Tpo -c -o libcommonpth_a-percent.obj `if test -f 'percent.c'; then $(CYGPATH_W) 'percent.c'; else $(CYGPATH_W) '$(srcdir)/percent.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-percent.Tpo $(DEPDIR)/libcommonpth_a-percent.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='percent.c' object='libcommonpth_a-percent.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-percent.obj `if test -f 'percent.c'; then $(CYGPATH_W) 'percent.c'; else $(CYGPATH_W) '$(srcdir)/percent.c'; fi`
+
+libcommonpth_a-mbox-util.o: mbox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-mbox-util.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-mbox-util.Tpo -c -o libcommonpth_a-mbox-util.o `test -f 'mbox-util.c' || echo '$(srcdir)/'`mbox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-mbox-util.Tpo $(DEPDIR)/libcommonpth_a-mbox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbox-util.c' object='libcommonpth_a-mbox-util.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-mbox-util.o `test -f 'mbox-util.c' || echo '$(srcdir)/'`mbox-util.c
+
+libcommonpth_a-mbox-util.obj: mbox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-mbox-util.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-mbox-util.Tpo -c -o libcommonpth_a-mbox-util.obj `if test -f 'mbox-util.c'; then $(CYGPATH_W) 'mbox-util.c'; else $(CYGPATH_W) '$(srcdir)/mbox-util.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-mbox-util.Tpo $(DEPDIR)/libcommonpth_a-mbox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mbox-util.c' object='libcommonpth_a-mbox-util.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-mbox-util.obj `if test -f 'mbox-util.c'; then $(CYGPATH_W) 'mbox-util.c'; else $(CYGPATH_W) '$(srcdir)/mbox-util.c'; fi`
+
+libcommonpth_a-miscellaneous.o: miscellaneous.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-miscellaneous.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-miscellaneous.Tpo -c -o libcommonpth_a-miscellaneous.o `test -f 'miscellaneous.c' || echo '$(srcdir)/'`miscellaneous.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-miscellaneous.Tpo $(DEPDIR)/libcommonpth_a-miscellaneous.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='miscellaneous.c' object='libcommonpth_a-miscellaneous.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-miscellaneous.o `test -f 'miscellaneous.c' || echo '$(srcdir)/'`miscellaneous.c
+
+libcommonpth_a-miscellaneous.obj: miscellaneous.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-miscellaneous.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-miscellaneous.Tpo -c -o libcommonpth_a-miscellaneous.obj `if test -f 'miscellaneous.c'; then $(CYGPATH_W) 'miscellaneous.c'; else $(CYGPATH_W) '$(srcdir)/miscellaneous.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-miscellaneous.Tpo $(DEPDIR)/libcommonpth_a-miscellaneous.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='miscellaneous.c' object='libcommonpth_a-miscellaneous.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-miscellaneous.obj `if test -f 'miscellaneous.c'; then $(CYGPATH_W) 'miscellaneous.c'; else $(CYGPATH_W) '$(srcdir)/miscellaneous.c'; fi`
+
+libcommonpth_a-xasprintf.o: xasprintf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-xasprintf.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-xasprintf.Tpo -c -o libcommonpth_a-xasprintf.o `test -f 'xasprintf.c' || echo '$(srcdir)/'`xasprintf.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-xasprintf.Tpo $(DEPDIR)/libcommonpth_a-xasprintf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xasprintf.c' object='libcommonpth_a-xasprintf.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-xasprintf.o `test -f 'xasprintf.c' || echo '$(srcdir)/'`xasprintf.c
+
+libcommonpth_a-xasprintf.obj: xasprintf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-xasprintf.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-xasprintf.Tpo -c -o libcommonpth_a-xasprintf.obj `if test -f 'xasprintf.c'; then $(CYGPATH_W) 'xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/xasprintf.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-xasprintf.Tpo $(DEPDIR)/libcommonpth_a-xasprintf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xasprintf.c' object='libcommonpth_a-xasprintf.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-xasprintf.obj `if test -f 'xasprintf.c'; then $(CYGPATH_W) 'xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/xasprintf.c'; fi`
+
+libcommonpth_a-xreadline.o: xreadline.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-xreadline.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-xreadline.Tpo -c -o libcommonpth_a-xreadline.o `test -f 'xreadline.c' || echo '$(srcdir)/'`xreadline.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-xreadline.Tpo $(DEPDIR)/libcommonpth_a-xreadline.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xreadline.c' object='libcommonpth_a-xreadline.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-xreadline.o `test -f 'xreadline.c' || echo '$(srcdir)/'`xreadline.c
+
+libcommonpth_a-xreadline.obj: xreadline.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-xreadline.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-xreadline.Tpo -c -o libcommonpth_a-xreadline.obj `if test -f 'xreadline.c'; then $(CYGPATH_W) 'xreadline.c'; else $(CYGPATH_W) '$(srcdir)/xreadline.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-xreadline.Tpo $(DEPDIR)/libcommonpth_a-xreadline.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xreadline.c' object='libcommonpth_a-xreadline.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-xreadline.obj `if test -f 'xreadline.c'; then $(CYGPATH_W) 'xreadline.c'; else $(CYGPATH_W) '$(srcdir)/xreadline.c'; fi`
+
+libcommonpth_a-membuf.o: membuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-membuf.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-membuf.Tpo -c -o libcommonpth_a-membuf.o `test -f 'membuf.c' || echo '$(srcdir)/'`membuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-membuf.Tpo $(DEPDIR)/libcommonpth_a-membuf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='membuf.c' object='libcommonpth_a-membuf.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-membuf.o `test -f 'membuf.c' || echo '$(srcdir)/'`membuf.c
+
+libcommonpth_a-membuf.obj: membuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-membuf.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-membuf.Tpo -c -o libcommonpth_a-membuf.obj `if test -f 'membuf.c'; then $(CYGPATH_W) 'membuf.c'; else $(CYGPATH_W) '$(srcdir)/membuf.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-membuf.Tpo $(DEPDIR)/libcommonpth_a-membuf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='membuf.c' object='libcommonpth_a-membuf.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-membuf.obj `if test -f 'membuf.c'; then $(CYGPATH_W) 'membuf.c'; else $(CYGPATH_W) '$(srcdir)/membuf.c'; fi`
+
+libcommonpth_a-iobuf.o: iobuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-iobuf.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-iobuf.Tpo -c -o libcommonpth_a-iobuf.o `test -f 'iobuf.c' || echo '$(srcdir)/'`iobuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-iobuf.Tpo $(DEPDIR)/libcommonpth_a-iobuf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iobuf.c' object='libcommonpth_a-iobuf.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-iobuf.o `test -f 'iobuf.c' || echo '$(srcdir)/'`iobuf.c
+
+libcommonpth_a-iobuf.obj: iobuf.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-iobuf.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-iobuf.Tpo -c -o libcommonpth_a-iobuf.obj `if test -f 'iobuf.c'; then $(CYGPATH_W) 'iobuf.c'; else $(CYGPATH_W) '$(srcdir)/iobuf.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-iobuf.Tpo $(DEPDIR)/libcommonpth_a-iobuf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iobuf.c' object='libcommonpth_a-iobuf.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-iobuf.obj `if test -f 'iobuf.c'; then $(CYGPATH_W) 'iobuf.c'; else $(CYGPATH_W) '$(srcdir)/iobuf.c'; fi`
+
+libcommonpth_a-ttyio.o: ttyio.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-ttyio.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-ttyio.Tpo -c -o libcommonpth_a-ttyio.o `test -f 'ttyio.c' || echo '$(srcdir)/'`ttyio.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-ttyio.Tpo $(DEPDIR)/libcommonpth_a-ttyio.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ttyio.c' object='libcommonpth_a-ttyio.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-ttyio.o `test -f 'ttyio.c' || echo '$(srcdir)/'`ttyio.c
+
+libcommonpth_a-ttyio.obj: ttyio.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-ttyio.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-ttyio.Tpo -c -o libcommonpth_a-ttyio.obj `if test -f 'ttyio.c'; then $(CYGPATH_W) 'ttyio.c'; else $(CYGPATH_W) '$(srcdir)/ttyio.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-ttyio.Tpo $(DEPDIR)/libcommonpth_a-ttyio.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ttyio.c' object='libcommonpth_a-ttyio.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-ttyio.obj `if test -f 'ttyio.c'; then $(CYGPATH_W) 'ttyio.c'; else $(CYGPATH_W) '$(srcdir)/ttyio.c'; fi`
+
+libcommonpth_a-asshelp.o: asshelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-asshelp.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-asshelp.Tpo -c -o libcommonpth_a-asshelp.o `test -f 'asshelp.c' || echo '$(srcdir)/'`asshelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-asshelp.Tpo $(DEPDIR)/libcommonpth_a-asshelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp.c' object='libcommonpth_a-asshelp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-asshelp.o `test -f 'asshelp.c' || echo '$(srcdir)/'`asshelp.c
+
+libcommonpth_a-asshelp.obj: asshelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-asshelp.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-asshelp.Tpo -c -o libcommonpth_a-asshelp.obj `if test -f 'asshelp.c'; then $(CYGPATH_W) 'asshelp.c'; else $(CYGPATH_W) '$(srcdir)/asshelp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-asshelp.Tpo $(DEPDIR)/libcommonpth_a-asshelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp.c' object='libcommonpth_a-asshelp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-asshelp.obj `if test -f 'asshelp.c'; then $(CYGPATH_W) 'asshelp.c'; else $(CYGPATH_W) '$(srcdir)/asshelp.c'; fi`
+
+libcommonpth_a-asshelp2.o: asshelp2.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-asshelp2.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-asshelp2.Tpo -c -o libcommonpth_a-asshelp2.o `test -f 'asshelp2.c' || echo '$(srcdir)/'`asshelp2.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-asshelp2.Tpo $(DEPDIR)/libcommonpth_a-asshelp2.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp2.c' object='libcommonpth_a-asshelp2.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-asshelp2.o `test -f 'asshelp2.c' || echo '$(srcdir)/'`asshelp2.c
+
+libcommonpth_a-asshelp2.obj: asshelp2.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-asshelp2.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-asshelp2.Tpo -c -o libcommonpth_a-asshelp2.obj `if test -f 'asshelp2.c'; then $(CYGPATH_W) 'asshelp2.c'; else $(CYGPATH_W) '$(srcdir)/asshelp2.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-asshelp2.Tpo $(DEPDIR)/libcommonpth_a-asshelp2.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp2.c' object='libcommonpth_a-asshelp2.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-asshelp2.obj `if test -f 'asshelp2.c'; then $(CYGPATH_W) 'asshelp2.c'; else $(CYGPATH_W) '$(srcdir)/asshelp2.c'; fi`
+
+libcommonpth_a-signal.o: signal.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-signal.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-signal.Tpo -c -o libcommonpth_a-signal.o `test -f 'signal.c' || echo '$(srcdir)/'`signal.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-signal.Tpo $(DEPDIR)/libcommonpth_a-signal.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signal.c' object='libcommonpth_a-signal.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-signal.o `test -f 'signal.c' || echo '$(srcdir)/'`signal.c
+
+libcommonpth_a-signal.obj: signal.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-signal.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-signal.Tpo -c -o libcommonpth_a-signal.obj `if test -f 'signal.c'; then $(CYGPATH_W) 'signal.c'; else $(CYGPATH_W) '$(srcdir)/signal.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-signal.Tpo $(DEPDIR)/libcommonpth_a-signal.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signal.c' object='libcommonpth_a-signal.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-signal.obj `if test -f 'signal.c'; then $(CYGPATH_W) 'signal.c'; else $(CYGPATH_W) '$(srcdir)/signal.c'; fi`
+
+libcommonpth_a-audit.o: audit.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-audit.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-audit.Tpo -c -o libcommonpth_a-audit.o `test -f 'audit.c' || echo '$(srcdir)/'`audit.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-audit.Tpo $(DEPDIR)/libcommonpth_a-audit.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='audit.c' object='libcommonpth_a-audit.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-audit.o `test -f 'audit.c' || echo '$(srcdir)/'`audit.c
+
+libcommonpth_a-audit.obj: audit.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-audit.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-audit.Tpo -c -o libcommonpth_a-audit.obj `if test -f 'audit.c'; then $(CYGPATH_W) 'audit.c'; else $(CYGPATH_W) '$(srcdir)/audit.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-audit.Tpo $(DEPDIR)/libcommonpth_a-audit.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='audit.c' object='libcommonpth_a-audit.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-audit.obj `if test -f 'audit.c'; then $(CYGPATH_W) 'audit.c'; else $(CYGPATH_W) '$(srcdir)/audit.c'; fi`
+
+libcommonpth_a-localename.o: localename.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-localename.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-localename.Tpo -c -o libcommonpth_a-localename.o `test -f 'localename.c' || echo '$(srcdir)/'`localename.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-localename.Tpo $(DEPDIR)/libcommonpth_a-localename.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='localename.c' object='libcommonpth_a-localename.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-localename.o `test -f 'localename.c' || echo '$(srcdir)/'`localename.c
+
+libcommonpth_a-localename.obj: localename.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-localename.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-localename.Tpo -c -o libcommonpth_a-localename.obj `if test -f 'localename.c'; then $(CYGPATH_W) 'localename.c'; else $(CYGPATH_W) '$(srcdir)/localename.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-localename.Tpo $(DEPDIR)/libcommonpth_a-localename.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='localename.c' object='libcommonpth_a-localename.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-localename.obj `if test -f 'localename.c'; then $(CYGPATH_W) 'localename.c'; else $(CYGPATH_W) '$(srcdir)/localename.c'; fi`
+
+libcommonpth_a-session-env.o: session-env.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-session-env.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-session-env.Tpo -c -o libcommonpth_a-session-env.o `test -f 'session-env.c' || echo '$(srcdir)/'`session-env.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-session-env.Tpo $(DEPDIR)/libcommonpth_a-session-env.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='session-env.c' object='libcommonpth_a-session-env.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-session-env.o `test -f 'session-env.c' || echo '$(srcdir)/'`session-env.c
+
+libcommonpth_a-session-env.obj: session-env.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-session-env.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-session-env.Tpo -c -o libcommonpth_a-session-env.obj `if test -f 'session-env.c'; then $(CYGPATH_W) 'session-env.c'; else $(CYGPATH_W) '$(srcdir)/session-env.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-session-env.Tpo $(DEPDIR)/libcommonpth_a-session-env.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='session-env.c' object='libcommonpth_a-session-env.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-session-env.obj `if test -f 'session-env.c'; then $(CYGPATH_W) 'session-env.c'; else $(CYGPATH_W) '$(srcdir)/session-env.c'; fi`
+
+libcommonpth_a-userids.o: userids.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-userids.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-userids.Tpo -c -o libcommonpth_a-userids.o `test -f 'userids.c' || echo '$(srcdir)/'`userids.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-userids.Tpo $(DEPDIR)/libcommonpth_a-userids.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='userids.c' object='libcommonpth_a-userids.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-userids.o `test -f 'userids.c' || echo '$(srcdir)/'`userids.c
+
+libcommonpth_a-userids.obj: userids.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-userids.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-userids.Tpo -c -o libcommonpth_a-userids.obj `if test -f 'userids.c'; then $(CYGPATH_W) 'userids.c'; else $(CYGPATH_W) '$(srcdir)/userids.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-userids.Tpo $(DEPDIR)/libcommonpth_a-userids.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='userids.c' object='libcommonpth_a-userids.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-userids.obj `if test -f 'userids.c'; then $(CYGPATH_W) 'userids.c'; else $(CYGPATH_W) '$(srcdir)/userids.c'; fi`
+
+libcommonpth_a-openpgp-oid.o: openpgp-oid.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-openpgp-oid.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-openpgp-oid.Tpo -c -o libcommonpth_a-openpgp-oid.o `test -f 'openpgp-oid.c' || echo '$(srcdir)/'`openpgp-oid.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-openpgp-oid.Tpo $(DEPDIR)/libcommonpth_a-openpgp-oid.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='openpgp-oid.c' object='libcommonpth_a-openpgp-oid.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-openpgp-oid.o `test -f 'openpgp-oid.c' || echo '$(srcdir)/'`openpgp-oid.c
+
+libcommonpth_a-openpgp-oid.obj: openpgp-oid.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-openpgp-oid.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-openpgp-oid.Tpo -c -o libcommonpth_a-openpgp-oid.obj `if test -f 'openpgp-oid.c'; then $(CYGPATH_W) 'openpgp-oid.c'; else $(CYGPATH_W) '$(srcdir)/openpgp-oid.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-openpgp-oid.Tpo $(DEPDIR)/libcommonpth_a-openpgp-oid.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='openpgp-oid.c' object='libcommonpth_a-openpgp-oid.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-openpgp-oid.obj `if test -f 'openpgp-oid.c'; then $(CYGPATH_W) 'openpgp-oid.c'; else $(CYGPATH_W) '$(srcdir)/openpgp-oid.c'; fi`
+
+libcommonpth_a-ssh-utils.o: ssh-utils.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-ssh-utils.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-ssh-utils.Tpo -c -o libcommonpth_a-ssh-utils.o `test -f 'ssh-utils.c' || echo '$(srcdir)/'`ssh-utils.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-ssh-utils.Tpo $(DEPDIR)/libcommonpth_a-ssh-utils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ssh-utils.c' object='libcommonpth_a-ssh-utils.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-ssh-utils.o `test -f 'ssh-utils.c' || echo '$(srcdir)/'`ssh-utils.c
+
+libcommonpth_a-ssh-utils.obj: ssh-utils.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-ssh-utils.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-ssh-utils.Tpo -c -o libcommonpth_a-ssh-utils.obj `if test -f 'ssh-utils.c'; then $(CYGPATH_W) 'ssh-utils.c'; else $(CYGPATH_W) '$(srcdir)/ssh-utils.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-ssh-utils.Tpo $(DEPDIR)/libcommonpth_a-ssh-utils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ssh-utils.c' object='libcommonpth_a-ssh-utils.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-ssh-utils.obj `if test -f 'ssh-utils.c'; then $(CYGPATH_W) 'ssh-utils.c'; else $(CYGPATH_W) '$(srcdir)/ssh-utils.c'; fi`
+
+libcommonpth_a-agent-opt.o: agent-opt.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-agent-opt.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-agent-opt.Tpo -c -o libcommonpth_a-agent-opt.o `test -f 'agent-opt.c' || echo '$(srcdir)/'`agent-opt.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-agent-opt.Tpo $(DEPDIR)/libcommonpth_a-agent-opt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='agent-opt.c' object='libcommonpth_a-agent-opt.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-agent-opt.o `test -f 'agent-opt.c' || echo '$(srcdir)/'`agent-opt.c
+
+libcommonpth_a-agent-opt.obj: agent-opt.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-agent-opt.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-agent-opt.Tpo -c -o libcommonpth_a-agent-opt.obj `if test -f 'agent-opt.c'; then $(CYGPATH_W) 'agent-opt.c'; else $(CYGPATH_W) '$(srcdir)/agent-opt.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-agent-opt.Tpo $(DEPDIR)/libcommonpth_a-agent-opt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='agent-opt.c' object='libcommonpth_a-agent-opt.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-agent-opt.obj `if test -f 'agent-opt.c'; then $(CYGPATH_W) 'agent-opt.c'; else $(CYGPATH_W) '$(srcdir)/agent-opt.c'; fi`
+
+libcommonpth_a-helpfile.o: helpfile.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-helpfile.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-helpfile.Tpo -c -o libcommonpth_a-helpfile.o `test -f 'helpfile.c' || echo '$(srcdir)/'`helpfile.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-helpfile.Tpo $(DEPDIR)/libcommonpth_a-helpfile.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='helpfile.c' object='libcommonpth_a-helpfile.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-helpfile.o `test -f 'helpfile.c' || echo '$(srcdir)/'`helpfile.c
+
+libcommonpth_a-helpfile.obj: helpfile.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-helpfile.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-helpfile.Tpo -c -o libcommonpth_a-helpfile.obj `if test -f 'helpfile.c'; then $(CYGPATH_W) 'helpfile.c'; else $(CYGPATH_W) '$(srcdir)/helpfile.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-helpfile.Tpo $(DEPDIR)/libcommonpth_a-helpfile.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='helpfile.c' object='libcommonpth_a-helpfile.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-helpfile.obj `if test -f 'helpfile.c'; then $(CYGPATH_W) 'helpfile.c'; else $(CYGPATH_W) '$(srcdir)/helpfile.c'; fi`
+
+libcommonpth_a-mkdir_p.o: mkdir_p.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-mkdir_p.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-mkdir_p.Tpo -c -o libcommonpth_a-mkdir_p.o `test -f 'mkdir_p.c' || echo '$(srcdir)/'`mkdir_p.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-mkdir_p.Tpo $(DEPDIR)/libcommonpth_a-mkdir_p.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mkdir_p.c' object='libcommonpth_a-mkdir_p.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-mkdir_p.o `test -f 'mkdir_p.c' || echo '$(srcdir)/'`mkdir_p.c
+
+libcommonpth_a-mkdir_p.obj: mkdir_p.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-mkdir_p.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-mkdir_p.Tpo -c -o libcommonpth_a-mkdir_p.obj `if test -f 'mkdir_p.c'; then $(CYGPATH_W) 'mkdir_p.c'; else $(CYGPATH_W) '$(srcdir)/mkdir_p.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-mkdir_p.Tpo $(DEPDIR)/libcommonpth_a-mkdir_p.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mkdir_p.c' object='libcommonpth_a-mkdir_p.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-mkdir_p.obj `if test -f 'mkdir_p.c'; then $(CYGPATH_W) 'mkdir_p.c'; else $(CYGPATH_W) '$(srcdir)/mkdir_p.c'; fi`
+
++libcommonpth_a-call-gpg.o: call-gpg.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-call-gpg.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-call-gpg.Tpo -c -o libcommonpth_a-call-gpg.o `test -f 'call-gpg.c' || echo '$(srcdir)/'`call-gpg.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-call-gpg.Tpo $(DEPDIR)/libcommonpth_a-call-gpg.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='call-gpg.c' object='libcommonpth_a-call-gpg.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-call-gpg.o `test -f 'call-gpg.c' || echo '$(srcdir)/'`call-gpg.c
++
++libcommonpth_a-call-gpg.obj: call-gpg.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-call-gpg.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-call-gpg.Tpo -c -o libcommonpth_a-call-gpg.obj `if test -f 'call-gpg.c'; then $(CYGPATH_W) 'call-gpg.c'; else $(CYGPATH_W) '$(srcdir)/call-gpg.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-call-gpg.Tpo $(DEPDIR)/libcommonpth_a-call-gpg.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='call-gpg.c' object='libcommonpth_a-call-gpg.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-call-gpg.obj `if test -f 'call-gpg.c'; then $(CYGPATH_W) 'call-gpg.c'; else $(CYGPATH_W) '$(srcdir)/call-gpg.c'; fi`
++
+libcommonpth_a-w32-reg.o: w32-reg.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-w32-reg.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-w32-reg.Tpo -c -o libcommonpth_a-w32-reg.o `test -f 'w32-reg.c' || echo '$(srcdir)/'`w32-reg.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-w32-reg.Tpo $(DEPDIR)/libcommonpth_a-w32-reg.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='w32-reg.c' object='libcommonpth_a-w32-reg.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-w32-reg.o `test -f 'w32-reg.c' || echo '$(srcdir)/'`w32-reg.c
+
+libcommonpth_a-w32-reg.obj: w32-reg.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-w32-reg.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-w32-reg.Tpo -c -o libcommonpth_a-w32-reg.obj `if test -f 'w32-reg.c'; then $(CYGPATH_W) 'w32-reg.c'; else $(CYGPATH_W) '$(srcdir)/w32-reg.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-w32-reg.Tpo $(DEPDIR)/libcommonpth_a-w32-reg.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='w32-reg.c' object='libcommonpth_a-w32-reg.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-w32-reg.obj `if test -f 'w32-reg.c'; then $(CYGPATH_W) 'w32-reg.c'; else $(CYGPATH_W) '$(srcdir)/w32-reg.c'; fi`
+
+libcommonpth_a-w32-afunix.o: w32-afunix.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-w32-afunix.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-w32-afunix.Tpo -c -o libcommonpth_a-w32-afunix.o `test -f 'w32-afunix.c' || echo '$(srcdir)/'`w32-afunix.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-w32-afunix.Tpo $(DEPDIR)/libcommonpth_a-w32-afunix.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='w32-afunix.c' object='libcommonpth_a-w32-afunix.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-w32-afunix.o `test -f 'w32-afunix.c' || echo '$(srcdir)/'`w32-afunix.c
+
+libcommonpth_a-w32-afunix.obj: w32-afunix.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-w32-afunix.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-w32-afunix.Tpo -c -o libcommonpth_a-w32-afunix.obj `if test -f 'w32-afunix.c'; then $(CYGPATH_W) 'w32-afunix.c'; else $(CYGPATH_W) '$(srcdir)/w32-afunix.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-w32-afunix.Tpo $(DEPDIR)/libcommonpth_a-w32-afunix.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='w32-afunix.c' object='libcommonpth_a-w32-afunix.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-w32-afunix.obj `if test -f 'w32-afunix.c'; then $(CYGPATH_W) 'w32-afunix.c'; else $(CYGPATH_W) '$(srcdir)/w32-afunix.c'; fi`
+
+libcommonpth_a-exechelp-w32ce.o: exechelp-w32ce.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-exechelp-w32ce.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Tpo -c -o libcommonpth_a-exechelp-w32ce.o `test -f 'exechelp-w32ce.c' || echo '$(srcdir)/'`exechelp-w32ce.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Tpo $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-w32ce.c' object='libcommonpth_a-exechelp-w32ce.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-exechelp-w32ce.o `test -f 'exechelp-w32ce.c' || echo '$(srcdir)/'`exechelp-w32ce.c
+
+libcommonpth_a-exechelp-w32ce.obj: exechelp-w32ce.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-exechelp-w32ce.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Tpo -c -o libcommonpth_a-exechelp-w32ce.obj `if test -f 'exechelp-w32ce.c'; then $(CYGPATH_W) 'exechelp-w32ce.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32ce.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Tpo $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-w32ce.c' object='libcommonpth_a-exechelp-w32ce.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-exechelp-w32ce.obj `if test -f 'exechelp-w32ce.c'; then $(CYGPATH_W) 'exechelp-w32ce.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32ce.c'; fi`
+
+libcommonpth_a-exechelp-w32.o: exechelp-w32.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-exechelp-w32.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-exechelp-w32.Tpo -c -o libcommonpth_a-exechelp-w32.o `test -f 'exechelp-w32.c' || echo '$(srcdir)/'`exechelp-w32.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-exechelp-w32.Tpo $(DEPDIR)/libcommonpth_a-exechelp-w32.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-w32.c' object='libcommonpth_a-exechelp-w32.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-exechelp-w32.o `test -f 'exechelp-w32.c' || echo '$(srcdir)/'`exechelp-w32.c
+
+libcommonpth_a-exechelp-w32.obj: exechelp-w32.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-exechelp-w32.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-exechelp-w32.Tpo -c -o libcommonpth_a-exechelp-w32.obj `if test -f 'exechelp-w32.c'; then $(CYGPATH_W) 'exechelp-w32.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-exechelp-w32.Tpo $(DEPDIR)/libcommonpth_a-exechelp-w32.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-w32.c' object='libcommonpth_a-exechelp-w32.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-exechelp-w32.obj `if test -f 'exechelp-w32.c'; then $(CYGPATH_W) 'exechelp-w32.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32.c'; fi`
+
+libcommonpth_a-exechelp-posix.o: exechelp-posix.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-exechelp-posix.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-exechelp-posix.Tpo -c -o libcommonpth_a-exechelp-posix.o `test -f 'exechelp-posix.c' || echo '$(srcdir)/'`exechelp-posix.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-exechelp-posix.Tpo $(DEPDIR)/libcommonpth_a-exechelp-posix.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-posix.c' object='libcommonpth_a-exechelp-posix.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-exechelp-posix.o `test -f 'exechelp-posix.c' || echo '$(srcdir)/'`exechelp-posix.c
+
+libcommonpth_a-exechelp-posix.obj: exechelp-posix.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-exechelp-posix.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-exechelp-posix.Tpo -c -o libcommonpth_a-exechelp-posix.obj `if test -f 'exechelp-posix.c'; then $(CYGPATH_W) 'exechelp-posix.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-posix.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-exechelp-posix.Tpo $(DEPDIR)/libcommonpth_a-exechelp-posix.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exechelp-posix.c' object='libcommonpth_a-exechelp-posix.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-exechelp-posix.obj `if test -f 'exechelp-posix.c'; then $(CYGPATH_W) 'exechelp-posix.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-posix.c'; fi`
+
- libcommonpth_a-srv.o: srv.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-srv.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-srv.Tpo -c -o libcommonpth_a-srv.o `test -f 'srv.c' || echo '$(srcdir)/'`srv.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-srv.Tpo $(DEPDIR)/libcommonpth_a-srv.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='srv.c' object='libcommonpth_a-srv.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-srv.o `test -f 'srv.c' || echo '$(srcdir)/'`srv.c
-
- libcommonpth_a-srv.obj: srv.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-srv.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-srv.Tpo -c -o libcommonpth_a-srv.obj `if test -f 'srv.c'; then $(CYGPATH_W) 'srv.c'; else $(CYGPATH_W) '$(srcdir)/srv.c'; fi`
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-srv.Tpo $(DEPDIR)/libcommonpth_a-srv.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='srv.c' object='libcommonpth_a-srv.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-srv.obj `if test -f 'srv.c'; then $(CYGPATH_W) 'srv.c'; else $(CYGPATH_W) '$(srcdir)/srv.c'; fi`
-
- libcommontls_a-http.o: http.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommontls_a_CFLAGS) $(CFLAGS) -MT libcommontls_a-http.o -MD -MP -MF $(DEPDIR)/libcommontls_a-http.Tpo -c -o libcommontls_a-http.o `test -f 'http.c' || echo '$(srcdir)/'`http.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommontls_a-http.Tpo $(DEPDIR)/libcommontls_a-http.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='http.c' object='libcommontls_a-http.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommontls_a_CFLAGS) $(CFLAGS) -c -o libcommontls_a-http.o `test -f 'http.c' || echo '$(srcdir)/'`http.c
-
- libcommontls_a-http.obj: http.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommontls_a_CFLAGS) $(CFLAGS) -MT libcommontls_a-http.obj -MD -MP -MF $(DEPDIR)/libcommontls_a-http.Tpo -c -o libcommontls_a-http.obj `if test -f 'http.c'; then $(CYGPATH_W) 'http.c'; else $(CYGPATH_W) '$(srcdir)/http.c'; fi`
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommontls_a-http.Tpo $(DEPDIR)/libcommontls_a-http.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='http.c' object='libcommontls_a-http.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommontls_a_CFLAGS) $(CFLAGS) -c -o libcommontls_a-http.obj `if test -f 'http.c'; then $(CYGPATH_W) 'http.c'; else $(CYGPATH_W) '$(srcdir)/http.c'; fi`
-
- libcommontlsnpth_a-http.o: http.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommontlsnpth_a_CFLAGS) $(CFLAGS) -MT libcommontlsnpth_a-http.o -MD -MP -MF $(DEPDIR)/libcommontlsnpth_a-http.Tpo -c -o libcommontlsnpth_a-http.o `test -f 'http.c' || echo '$(srcdir)/'`http.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommontlsnpth_a-http.Tpo $(DEPDIR)/libcommontlsnpth_a-http.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='http.c' object='libcommontlsnpth_a-http.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommontlsnpth_a_CFLAGS) $(CFLAGS) -c -o libcommontlsnpth_a-http.o `test -f 'http.c' || echo '$(srcdir)/'`http.c
-
- libcommontlsnpth_a-http.obj: http.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommontlsnpth_a_CFLAGS) $(CFLAGS) -MT libcommontlsnpth_a-http.obj -MD -MP -MF $(DEPDIR)/libcommontlsnpth_a-http.Tpo -c -o libcommontlsnpth_a-http.obj `if test -f 'http.c'; then $(CYGPATH_W) 'http.c'; else $(CYGPATH_W) '$(srcdir)/http.c'; fi`
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcommontlsnpth_a-http.Tpo $(DEPDIR)/libcommontlsnpth_a-http.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='http.c' object='libcommontlsnpth_a-http.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommontlsnpth_a_CFLAGS) $(CFLAGS) -c -o libcommontlsnpth_a-http.obj `if test -f 'http.c'; then $(CYGPATH_W) 'http.c'; else $(CYGPATH_W) '$(srcdir)/http.c'; fi`
-
+libsimple_pwquery_a-simple-pwquery.o: simple-pwquery.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsimple_pwquery_a_CFLAGS) $(CFLAGS) -MT libsimple_pwquery_a-simple-pwquery.o -MD -MP -MF $(DEPDIR)/libsimple_pwquery_a-simple-pwquery.Tpo -c -o libsimple_pwquery_a-simple-pwquery.o `test -f 'simple-pwquery.c' || echo '$(srcdir)/'`simple-pwquery.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsimple_pwquery_a-simple-pwquery.Tpo $(DEPDIR)/libsimple_pwquery_a-simple-pwquery.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple-pwquery.c' object='libsimple_pwquery_a-simple-pwquery.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsimple_pwquery_a_CFLAGS) $(CFLAGS) -c -o libsimple_pwquery_a-simple-pwquery.o `test -f 'simple-pwquery.c' || echo '$(srcdir)/'`simple-pwquery.c
+
+libsimple_pwquery_a-simple-pwquery.obj: simple-pwquery.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsimple_pwquery_a_CFLAGS) $(CFLAGS) -MT libsimple_pwquery_a-simple-pwquery.obj -MD -MP -MF $(DEPDIR)/libsimple_pwquery_a-simple-pwquery.Tpo -c -o libsimple_pwquery_a-simple-pwquery.obj `if test -f 'simple-pwquery.c'; then $(CYGPATH_W) 'simple-pwquery.c'; else $(CYGPATH_W) '$(srcdir)/simple-pwquery.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsimple_pwquery_a-simple-pwquery.Tpo $(DEPDIR)/libsimple_pwquery_a-simple-pwquery.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple-pwquery.c' object='libsimple_pwquery_a-simple-pwquery.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsimple_pwquery_a_CFLAGS) $(CFLAGS) -c -o libsimple_pwquery_a-simple-pwquery.obj `if test -f 'simple-pwquery.c'; then $(CYGPATH_W) 'simple-pwquery.c'; else $(CYGPATH_W) '$(srcdir)/simple-pwquery.c'; fi`
+
+libsimple_pwquery_a-asshelp.o: asshelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsimple_pwquery_a_CFLAGS) $(CFLAGS) -MT libsimple_pwquery_a-asshelp.o -MD -MP -MF $(DEPDIR)/libsimple_pwquery_a-asshelp.Tpo -c -o libsimple_pwquery_a-asshelp.o `test -f 'asshelp.c' || echo '$(srcdir)/'`asshelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsimple_pwquery_a-asshelp.Tpo $(DEPDIR)/libsimple_pwquery_a-asshelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp.c' object='libsimple_pwquery_a-asshelp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsimple_pwquery_a_CFLAGS) $(CFLAGS) -c -o libsimple_pwquery_a-asshelp.o `test -f 'asshelp.c' || echo '$(srcdir)/'`asshelp.c
+
+libsimple_pwquery_a-asshelp.obj: asshelp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsimple_pwquery_a_CFLAGS) $(CFLAGS) -MT libsimple_pwquery_a-asshelp.obj -MD -MP -MF $(DEPDIR)/libsimple_pwquery_a-asshelp.Tpo -c -o libsimple_pwquery_a-asshelp.obj `if test -f 'asshelp.c'; then $(CYGPATH_W) 'asshelp.c'; else $(CYGPATH_W) '$(srcdir)/asshelp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsimple_pwquery_a-asshelp.Tpo $(DEPDIR)/libsimple_pwquery_a-asshelp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asshelp.c' object='libsimple_pwquery_a-asshelp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsimple_pwquery_a_CFLAGS) $(CFLAGS) -c -o libsimple_pwquery_a-asshelp.obj `if test -f 'asshelp.c'; then $(CYGPATH_W) 'asshelp.c'; else $(CYGPATH_W) '$(srcdir)/asshelp.c'; fi`
+
- t_http-t-http.o: t-http.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -MT t_http-t-http.o -MD -MP -MF $(DEPDIR)/t_http-t-http.Tpo -c -o t_http-t-http.o `test -f 't-http.c' || echo '$(srcdir)/'`t-http.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_http-t-http.Tpo $(DEPDIR)/t_http-t-http.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t-http.c' object='t_http-t-http.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -c -o t_http-t-http.o `test -f 't-http.c' || echo '$(srcdir)/'`t-http.c
-
- t_http-t-http.obj: t-http.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -MT t_http-t-http.obj -MD -MP -MF $(DEPDIR)/t_http-t-http.Tpo -c -o t_http-t-http.obj `if test -f 't-http.c'; then $(CYGPATH_W) 't-http.c'; else $(CYGPATH_W) '$(srcdir)/t-http.c'; fi`
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_http-t-http.Tpo $(DEPDIR)/t_http-t-http.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t-http.c' object='t_http-t-http.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -c -o t_http-t-http.obj `if test -f 't-http.c'; then $(CYGPATH_W) 't-http.c'; else $(CYGPATH_W) '$(srcdir)/t-http.c'; fi`
-
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ col=$$blu; res=SKIP; \
+ fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
+ All=""; \
+ else \
+ tests="tests"; \
+ All="All "; \
+ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="$$All$$all $$tests passed"; \
+ else \
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all $$tests failed"; \
+ else \
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LIBRARIES) $(PROGRAMS)
+installdirs:
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check check-am install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+# Note: Due to the dependency on Makefile, the file will always be
+# rebuilt, so we allow this only in maintainer mode.
+
+# Create the audit-events.h include file from audit.h
+# Note: We create the target file in the source directory because it
+# is a distributed built source. If we would not do that we may end
+# up with two files and then it is not clear which version of the
+# files will be picked up.
+ at MAINTAINER_MODE_TRUE@audit-events.h: Makefile.am mkstrtable.awk exaudit.awk audit.h
+ at MAINTAINER_MODE_TRUE@ $(AWK) -f $(srcdir)/exaudit.awk $(srcdir)/audit.h \
+ at MAINTAINER_MODE_TRUE@ | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
+ at MAINTAINER_MODE_TRUE@ -v namespace=eventstr_ > $(srcdir)/audit-events.h
+
+# Create the status-codes.h include file from status.h
+ at MAINTAINER_MODE_TRUE@status-codes.h: Makefile.am mkstrtable.awk exstatus.awk status.h
+ at MAINTAINER_MODE_TRUE@ $(AWK) -f $(srcdir)/exstatus.awk $(srcdir)/status.h \
+ at MAINTAINER_MODE_TRUE@ | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
+ at MAINTAINER_MODE_TRUE@ -v namespace=statusstr_ > $(srcdir)/status-codes.h
+
+# All programs should depend on the created libs.
- $(PROGRAMS) : libcommon.a libcommonpth.a libcommontls.a libcommontlsnpth.a
++$(PROGRAMS) : libcommon.a libcommonpth.a
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc common/status-codes.h
index b850600,0000000..0d79634
mode 100644,000000..100644
--- a/common/status-codes.h
+++ b/common/status-codes.h
@@@ -1,206 -1,0 +1,212 @@@
+/* Output of mkstrtable.awk. DO NOT EDIT. */
+
+/* status.h - Status codes
+ * Copyright (C) 2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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.
+ *
+ * GnuPG 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_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"
+ "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"
+ "TRUNCATED" "\0"
+ "MOUNTPOINT" "\0"
+ "PINENTRY_LAUNCHED" "\0"
++ "PLAINTEXT_FOLLOWS" "\0"
+ "ERROR" "\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,
- 396,
- 406,
- 417,
- 434,
- 449,
- 466,
- 481,
- 495,
- 510,
- 519,
- 528,
++ 394,
++ 405,
++ 416,
++ 426,
++ 437,
++ 454,
++ 469,
++ 486,
++ 501,
++ 515,
++ 530,
+ 539,
- 546,
- 555,
- 567,
- 579,
- 593,
- 607,
- 618,
- 630,
- 642,
- 653,
++ 548,
++ 559,
++ 566,
++ 575,
++ 587,
++ 599,
++ 613,
++ 627,
++ 638,
++ 650,
+ 662,
- 671,
- 679,
- 687,
- 702,
- 713,
- 724,
- 731,
- 741,
++ 673,
++ 682,
++ 691,
++ 699,
++ 707,
++ 722,
++ 733,
++ 744,
+ 751,
+ 761,
- 768,
- 782,
- 792,
- 809,
- 825,
++ 771,
++ 781,
++ 788,
++ 802,
++ 812,
++ 829,
+ 845,
- 854,
- 868,
- 882,
- 901,
- 915,
- 930,
- 940,
- 951,
- 969,
- 975,
- 983,
- 991,
++ 865,
++ 874,
++ 888,
++ 902,
++ 921,
++ 935,
++ 950,
++ 960,
++ 971,
++ 989,
++ 1007,
++ 1013,
++ 1021,
++ 1029,
+
+ };
+
+#define statusstr_msgidxof(code) (0 ? -1 \
- : ((code >= 0) && (code <= 85)) ? (code - 0) \
++ : ((code >= 0) && (code <= 88)) ? (code - 0) \
+ : -1)
diff --cc config.h.in
index 479e29e,0000000..ace57d7
mode 100644,000000..100644
--- a/config.h.in
+++ b/config.h.in
@@@ -1,911 -1,0 +1,920 @@@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+
+#ifndef GNUPG_CONFIG_H_INCLUDED
+#define GNUPG_CONFIG_H_INCLUDED
+
+
+/* Defined if the host has big endian byte ordering */
+#undef BIG_ENDIAN_HOST
+
+/* an Apple OSXism */
+#undef BIND_8_COMPAT
+
+/* GIT commit id revision used to build this package */
+#undef BUILD_REVISION
+
+/* The time this package was configured for a build */
+#undef BUILD_TIMESTAMP
+
+/* Defined if GPG-AGENT is to be build */
+#undef BUILD_WITH_AGENT
+
+/* Defined if SCDAEMON is to be build */
+#undef BUILD_WITH_DIRMNGR
+
+/* Defined if G13 is to be build */
+#undef BUILD_WITH_G13
+
+/* Defined if GPG is to be build */
+#undef BUILD_WITH_GPG
+
+/* Defined if GPGSM is to be build */
+#undef BUILD_WITH_GPGSM
+
+/* Defined if SCDAEMON is to be build */
+#undef BUILD_WITH_SCDAEMON
+
+/* The displayed name of dirmngr */
+#undef DIRMNGR_DISP_NAME
+
+/* The name of the dirmngr info envvar */
+#undef DIRMNGR_INFO_NAME
+
+/* The name of the dirmngr */
+#undef DIRMNGR_NAME
+
+/* The name of the dirmngr socket */
+#undef DIRMNGR_SOCK_NAME
+
+/* define to disable photo viewing */
+#undef DISABLE_PHOTO_VIEWER
+
+/* Define to disable regular expression support */
+#undef DISABLE_REGEX
+
+/* Define to include smartcard support */
+#undef ENABLE_CARD_SUPPORT
+
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+#undef ENABLE_NLS
+
+/* Define to enable SELinux support */
+#undef ENABLE_SELINUX_HACKS
+
+/* defines the filename of the encfs program */
+#undef ENCFS
+
+/* The executable file extension, if any */
+#undef EXEEXT
+
+/* if set, restrict photo-viewer to this */
+#undef FIXED_PHOTO_VIEWER
+
+/* defines the filename of the fusermount program */
+#undef FUSERMOUNT
+
+/* The displayed name of g13 */
+#undef G13_DISP_NAME
+
+/* The name of the g13 tool */
+#undef G13_NAME
+
+/* version of the libassuan library */
+#undef GNUPG_LIBASSUAN_VERSION
+
+/* The name of the project */
+#undef GNUPG_NAME
+
+/* The directory part of the W32 registry keys */
+#undef GNUPG_REGISTRY_DIR
+
+/* The displayed name of gpgconf */
+#undef GPGCONF_DISP_NAME
+
+/* The name of the gpgconf tool */
+#undef GPGCONF_NAME
+
+/* The standard binary file suffix */
+#undef GPGEXT_GPG
+
+/* The displayed name of gpgsm */
+#undef GPGSM_DISP_NAME
+
+/* The name of the S/MIME tool */
+#undef GPGSM_NAME
+
+/* The name of the gpgtar tool */
+#undef GPGTAR_NAME
+
+/* The displayed name of gpg-agent */
+#undef GPG_AGENT_DISP_NAME
+
+/* The name of the agent */
+#undef GPG_AGENT_NAME
+
+/* The name of the agent socket */
+#undef GPG_AGENT_SOCK_NAME
+
+/* The name of the agent socket for ssh */
+#undef GPG_AGENT_SSH_SOCK_NAME
+
+/* The displayed name of gpg */
+#undef GPG_DISP_NAME
+
+/* The name of the OpenPGP tool */
+#undef GPG_NAME
+
+/* Define to support the AES128 cipher */
+#undef GPG_USE_AES128
+
+/* Define to support the AES192 cipher */
+#undef GPG_USE_AES192
+
+/* Define to support the AES256 cipher */
+#undef GPG_USE_AES256
+
+/* Define to support the BLOWFISH cipher */
+#undef GPG_USE_BLOWFISH
+
+/* Define to support the CAMELLIA128 cipher */
+#undef GPG_USE_CAMELLIA128
+
+/* Define to support the CAMELLIA192 cipher */
+#undef GPG_USE_CAMELLIA192
+
+/* Define to support the CAMELLIA256 cipher */
+#undef GPG_USE_CAMELLIA256
+
+/* Define to support the CAST5 cipher */
+#undef GPG_USE_CAST5
+
+/* Define to support the ECDH public key */
+#undef GPG_USE_ECDH
+
+/* Define to support the ECDSA public key */
+#undef GPG_USE_ECDSA
+
+/* Define to support the EdDSA public key */
+#undef GPG_USE_EDDSA
+
+/* Define to support the IDEA cipher */
+#undef GPG_USE_IDEA
+
+/* Define to support the MD5 hash */
+#undef GPG_USE_MD5
+
+/* Define to support the RIPE-MD160 hash */
+#undef GPG_USE_RMD160
+
+/* Define to support the RSA public key */
+#undef GPG_USE_RSA
+
+/* Define to support the SHA-224 hash */
+#undef GPG_USE_SHA224
+
+/* Define to support the SHA-384 hash */
+#undef GPG_USE_SHA384
+
+/* Define to support the SHA-512 hash */
+#undef GPG_USE_SHA512
+
+/* Define to support the TWOFISH cipher */
+#undef GPG_USE_TWOFISH
+
++/* Define to 1 if you have the `adns_free' function. */
++#undef HAVE_ADNS_FREE
++
+/* Define to 1 if you have the <adns.h> header file. */
+#undef HAVE_ADNS_H
+
++/* define if adns_if_tormode is available */
++#undef HAVE_ADNS_IF_TORMODE
++
+/* Defined if we build for an Android system */
+#undef HAVE_ANDROID_SYSTEM
+
+/* Define to 1 if you have the `atexit' function. */
+#undef HAVE_ATEXIT
+
+/* Defined if ttyname does not work properly */
+#undef HAVE_BROKEN_TTYNAME
+
+/* Defined if a `byte' is typedef'd */
+#undef HAVE_BYTE_TYPEDEF
+
+/* Defined if the bz2 compression library is available */
+#undef HAVE_BZIP2
+
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+#undef HAVE_CANONICALIZE_FILE_NAME
+
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
+/* Define to 1 if you have the `clock_gettime' function. */
+#undef HAVE_CLOCK_GETTIME
+
+/* Define to 1 if you have the `ctermid' function. */
+#undef HAVE_CTERMID
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the declaration of `getpagesize', and to 0 if you
+ don't. */
+#undef HAVE_DECL_GETPAGESIZE
+
+/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
+ don't. */
+#undef HAVE_DECL_SYS_SIGLIST
+
+/* Define to 1 if you have the <direct.h> header file. */
+#undef HAVE_DIRECT_H
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+#undef HAVE_DOPRNT
+
+/* Defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2)
+ with special properties like no file modes, case insensitive file names and
+ preferred use of backslashes as directory name separators. */
+#undef HAVE_DOSISH_SYSTEM
+
+/* Defined if the OS supports drive letters. */
+#undef HAVE_DRIVE_LETTERS
+
+/* Define to 1 if you have the `fcntl' function. */
+#undef HAVE_FCNTL
+
+/* Define to 1 if you have the `flockfile' function. */
+#undef HAVE_FLOCKFILE
+
+/* Define to 1 if you have the `fopencookie' function. */
+#undef HAVE_FOPENCOOKIE
+
+/* Define to 1 if you have the `fork' function. */
+#undef HAVE_FORK
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#undef HAVE_FSEEKO
+
+/* Define to 1 if you have the `fsync' function. */
+#undef HAVE_FSYNC
+
+/* Define to 1 if you have the `ftello' function. */
+#undef HAVE_FTELLO
+
+/* Define to 1 if you have the `ftruncate' function. */
+#undef HAVE_FTRUNCATE
+
+/* Define to 1 if you have the `funlockfile' function. */
+#undef HAVE_FUNLOCKFILE
+
+/* Define to 1 if you have the `funopen' function. */
+#undef HAVE_FUNOPEN
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#undef HAVE_GETADDRINFO
+
+/* Define to 1 if you have the `getenv' function. */
+#undef HAVE_GETENV
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `getpwnam' function. */
+#undef HAVE_GETPWNAM
+
+/* Define to 1 if you have the `getpwuid' function. */
+#undef HAVE_GETPWUID
+
+/* Define to 1 if you have the `getrlimit' function. */
+#undef HAVE_GETRLIMIT
+
+/* Define to 1 if you have the `getrusage' function. */
+#undef HAVE_GETRUSAGE
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define to 1 if you have the `gmtime_r' function. */
+#undef HAVE_GMTIME_R
+
+/* Define if you have the iconv() function and it works. */
+#undef HAVE_ICONV
+
+/* Define to 1 if you have the `inet_ntop' function. */
+#undef HAVE_INET_NTOP
+
+/* Define to 1 if you have the `inet_pton' function. */
+#undef HAVE_INET_PTON
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `isascii' function. */
+#undef HAVE_ISASCII
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
+
+/* defined if liblber is available */
+#undef HAVE_LBER
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the `ldap_get_option' function. */
+#undef HAVE_LDAP_GET_OPTION
+
+/* Define if the LDAP library supports ld_errno */
+#undef HAVE_LDAP_LD_ERRNO
+
+/* Define to 1 if you have the `ldap_set_option' function. */
+#undef HAVE_LDAP_SET_OPTION
+
+/* Define to 1 if you have the `ldap_start_tls_s' function. */
+#undef HAVE_LDAP_START_TLS_S
+
+/* Define to 1 if you have the `ldap_start_tls_sA' function. */
+#undef HAVE_LDAP_START_TLS_SA
+
+/* Define to 1 if you have a fully functional readline library. */
+#undef HAVE_LIBREADLINE
+
+/* defined if libusb is available */
+#undef HAVE_LIBUSB
+
+/* defined if libutil is available */
+#undef HAVE_LIBUTIL
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the `lstat' function. */
+#undef HAVE_LSTAT
+
+/* Define to 1 if you have the `memicmp' function. */
+#undef HAVE_MEMICMP
+
+/* Define to 1 if you have the `memmove' function. */
+#undef HAVE_MEMMOVE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memrchr' function. */
+#undef HAVE_MEMRCHR
+
+/* Define to 1 if you have the `mmap' function. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `nl_langinfo' function. */
+#undef HAVE_NL_LANGINFO
+
+/* Defined if the New Portable Thread Library is available */
+#undef HAVE_NPTH
+
+/* Define to 1 if you have the `pipe' function. */
+#undef HAVE_PIPE
+
+/* Define to 1 if you have the <pty.h> header file. */
+#undef HAVE_PTY_H
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define to 1 if you have the `raise' function. */
+#undef HAVE_RAISE
+
+/* Define to 1 if you have the `rand' function. */
+#undef HAVE_RAND
+
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
+/* Define to 1 if you have the `setlocale' function. */
+#undef HAVE_SETLOCALE
+
+/* Define to 1 if you have the `setrlimit' function. */
+#undef HAVE_SETRLIMIT
+
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define to 1 if you have the <signal.h> header file. */
+#undef HAVE_SIGNAL_H
+
+/* Define to 1 if you have the `sigprocmask' function. */
+#undef HAVE_SIGPROCMASK
+
+/* Define to 1 if the system has the type `sigset_t'. */
+#undef HAVE_SIGSET_T
+
+/* Define to 1 if you have the `stat' function. */
+#undef HAVE_STAT
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `stpcpy' function. */
+#undef HAVE_STPCPY
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the `strftime' function. */
+#undef HAVE_STRFTIME
+
+/* Define to 1 if you have the `stricmp' function. */
+#undef HAVE_STRICMP
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strlwr' function. */
+#undef HAVE_STRLWR
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
+/* Define to 1 if you have the `strpbrk' function. */
+#undef HAVE_STRPBRK
+
+/* Define to 1 if you have the `strsep' function. */
+#undef HAVE_STRSEP
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if you have the `strtoul' function. */
+#undef HAVE_STRTOUL
+
+/* Define to 1 if you have the `strtoull' function. */
+#undef HAVE_STRTOULL
+
+/* Define to 1 if the system has the type `struct sigaction'. */
+#undef HAVE_STRUCT_SIGACTION
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the `tcgetattr' function. */
+#undef HAVE_TCGETATTR
+
+/* Define to 1 if you have the <termio.h> header file. */
+#undef HAVE_TERMIO_H
+
+/* Define to 1 if you have the `timegm' function. */
+#undef HAVE_TIMEGM
+
+/* Define to 1 if you have the `times' function. */
+#undef HAVE_TIMES
+
+/* Define to 1 if you have the `ttyname' function. */
+#undef HAVE_TTYNAME
+
+/* Defined if a `u16' is typedef'd */
+#undef HAVE_U16_TYPEDEF
+
+/* Defined if a `u32' is typedef'd */
+#undef HAVE_U32_TYPEDEF
+
+/* Defined if a `ulong' is typedef'd */
+#undef HAVE_ULONG_TYPEDEF
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `unsetenv' function. */
+#undef HAVE_UNSETENV
+
+/* Defined if time_t is an unsigned type */
+#undef HAVE_UNSIGNED_TIME_T
+
+/* Define to 1 if you have the `usb_create_match' function. */
+#undef HAVE_USB_CREATE_MATCH
+
+/* Defined if a `ushort' is typedef'd */
+#undef HAVE_USHORT_TYPEDEF
+
+/* Define to 1 if you have the <utmp.h> header file. */
+#undef HAVE_UTMP_H
+
+/* Define to 1 if you have the `vfork' function. */
+#undef HAVE_VFORK
+
+/* Define to 1 if you have the <vfork.h> header file. */
+#undef HAVE_VFORK_H
+
+/* Define to 1 if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
+
+/* Defined if we run on WindowsCE */
+#undef HAVE_W32CE_SYSTEM
+
+/* Defined if we run on a W32 API based system */
+#undef HAVE_W32_SYSTEM
+
+/* Define to 1 if you have the `wait4' function. */
+#undef HAVE_WAIT4
+
+/* Define to 1 if you have the `waitpid' function. */
+#undef HAVE_WAITPID
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+#undef HAVE_WINSOCK2_H
+
+/* Define to 1 if `fork' works. */
+#undef HAVE_WORKING_FORK
+
+/* Define to 1 if `vfork' works. */
+#undef HAVE_WORKING_VFORK
+
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+#undef HAVE_WS2TCPIP_H
+
+/* Defined if ZIP and ZLIB are supported */
+#undef HAVE_ZIP
+
+/* Enable GNUTLS support in http.c */
+#undef HTTP_USE_GNUTLS
+
+/* Enable NTBTLS support in http.c */
+#undef HTTP_USE_NTBTLS
+
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
+/* Defined if this is not a regular release */
+#undef IS_DEVELOPMENT_VERSION
+
+/* Defined if the host has little endian byte ordering */
+#undef LITTLE_ENDIAN_HOST
+
+/* Defined if mkdir() does not take permission flags */
+#undef MKDIR_TAKES_ONE_ARG
+
+/* The name of the installed GPG tool */
+#undef NAME_OF_INSTALLED_GPG
+
+/* Required version of Libksba */
+#undef NEED_KSBA_VERSION
+
+/* Define if the LDAP library requires including lber.h before ldap.h */
+#undef NEED_LBER_H
+
+/* Required version of Libgcrypt */
+#undef NEED_LIBGCRYPT_VERSION
+
+/* Required version of NTBTLS */
+#undef NEED_NTBTLS_VERSION
+
+/* Define to disable all external program execution */
+#undef NO_EXEC
+
+/* Define to include only trust-model always */
+#undef NO_TRUST_MODELS
+
+/* Name of this package */
+#undef PACKAGE
+
+/* Bug report address */
+#undef PACKAGE_BUGREPORT
+
+/* Name of this package for gettext */
+#undef PACKAGE_GT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Size of the key and UID caches */
+#undef PK_UID_CACHE_SIZE
+
+/* A human readable text with the name of the OS */
+#undef PRINTABLE_OS_NAME
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Defined if we should run the tests */
+#undef RUN_TESTS
+
+/* The displayed name of scdaemon */
+#undef SCDAEMON_DISP_NAME
+
+/* The name of the scdaemon */
+#undef SCDAEMON_NAME
+
+/* The name of the SCdaemon socket */
+#undef SCDAEMON_SOCK_NAME
+
+/* Size of secure memory buffer */
+#undef SECMEM_BUFFER_SIZE
+
+/* defines the filename of the shred program */
+#undef SHRED
+
+/* The size of `time_t', as computed by sizeof. */
+#undef SIZEOF_TIME_T
+
+/* The size of `unsigned int', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_INT
+
+/* The size of `unsigned long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG
+
+/* The size of `unsigned long long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG_LONG
+
+/* The size of `unsigned short', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_SHORT
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Use ADNS as resolver library. */
+#undef USE_ADNS
+
+/* Define to enable auto starting of the dirmngr */
+#undef USE_DIRMNGR_AUTO_START
+
+/* define to use DNS CERT */
+#undef USE_DNS_CERT
+
+/* define to use DNS SRV */
+#undef USE_DNS_SRV
+
+/* Defined if LDAP is support */
+#undef USE_LDAP
+
+/* Build dirmngr with LDAP wrapper process */
+#undef USE_LDAPWRAPPER
+
+/* Defined if support for nPth is requested and nPth is available */
+#undef USE_NPTH
+
+/* Set this to limit filenames to the 8.3 format */
+#undef USE_ONLY_8DOT3
+
+/* Because the Unix gettext has too much overhead on MingW32 systems and these
+ systems lack Posix functions, we use a simplified version of gettext */
+#undef USE_SIMPLE_GETTEXT
+
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
++/* Enable to build the TOFU code */
++#undef USE_TOFU
++
+/* Version of this package */
+#undef VERSION
+
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef mode_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
+/* type to use in place of socklen_t if not defined */
+#undef socklen_t
+
+/* Define as `fork' if `vfork' does not work. */
+#undef vfork
+
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+ code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile
+
+
+/* This is the major version number of GnuPG so that
+ source included files can test for this. Note, that
+ we use 2 here even for GnuPG 1.9.x. */
+#define GNUPG_MAJOR_VERSION 2
+
+/* Now to separate file name parts.
+ Please note that the string version must not contain more
+ than one character because the code assumes strlen()==1 */
+#ifdef HAVE_DOSISH_SYSTEM
+#define DIRSEP_C '\\'
+#define DIRSEP_S "\\"
+#define EXTSEP_C '.'
+#define EXTSEP_S "."
+#define PATHSEP_C ';'
+#define PATHSEP_S ";"
+#define EXEEXT_S ".exe"
+#else
+#define DIRSEP_C '/'
+#define DIRSEP_S "/"
+#define EXTSEP_C '.'
+#define EXTSEP_S "."
+#define PATHSEP_C ':'
+#define PATHSEP_S ":"
+#define EXEEXT_S ""
+#endif
+
+/* This is the same as VERSION, but should be overridden if the
+ platform cannot handle things like dots '.' in filenames. Set
+ SAFE_VERSION_DOT and SAFE_VERSION_DASH to whatever SAFE_VERSION
+ uses for dots and dashes. */
+#define SAFE_VERSION VERSION
+#define SAFE_VERSION_DOT '.'
+#define SAFE_VERSION_DASH '-'
+
+/* Some global constants. */
+#ifdef HAVE_DOSISH_SYSTEM
+# ifdef HAVE_DRIVE_LETTERS
+# define GNUPG_DEFAULT_HOMEDIR "c:/gnupg"
+# else
+# define GNUPG_DEFAULT_HOMEDIR "/gnupg"
+# endif
+#elif defined(__VMS)
+#define GNUPG_DEFAULT_HOMEDIR "/SYS$LOGIN/gnupg"
+#else
+#define GNUPG_DEFAULT_HOMEDIR "~/.gnupg"
+#endif
+#define GNUPG_PRIVATE_KEYS_DIR "private-keys-v1.d"
+#define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
+
+/* For some systems (DOS currently), we hardcode the path here. For
+ POSIX systems the values are constructed by the Makefiles, so that
+ the values may be overridden by the make invocations; this is to
+ comply with the GNU coding standards. Note that these values are
+ only defaults. */
+#ifdef HAVE_DOSISH_SYSTEM
+# ifdef HAVE_DRIVE_LETTERS
+# define GNUPG_BINDIR "c:\\gnupg"
+# define GNUPG_LIBEXECDIR "c:\\gnupg"
+# define GNUPG_LIBDIR "c:\\gnupg"
+# define GNUPG_DATADIR "c:\\gnupg"
+# define GNUPG_SYSCONFDIR "c:\\gnupg"
+# else
+# define GNUPG_BINDIR "\\gnupg"
+# define GNUPG_LIBEXECDIR "\\gnupg"
+# define GNUPG_LIBDIR "\\gnupg"
+# define GNUPG_DATADIR "\\gnupg"
+# define GNUPG_SYSCONFDIR "\\gnupg"
+# endif
+#endif
+
+/* Derive some other constants. */
+#if !(defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID))
+#define EXEC_TEMPFILE_ONLY
+#endif
+
+
+/* We didn't define endianness above, so get it from OS macros. This
+ is intended for making fat binary builds on OS X. */
+#if !defined(BIG_ENDIAN_HOST) && !defined(LITTLE_ENDIAN_HOST)
+#if defined(__BIG_ENDIAN__)
+#define BIG_ENDIAN_HOST 1
+#elif defined(__LITTLE_ENDIAN__)
+#define LITTLE_ENDIAN_HOST 1
+#else
+#error "No endianness found"
+#endif
+#endif
+
+
+/* Hack used for W32: ldap.m4 also tests for the ASCII version of
+ ldap_start_tls_s because that is the actual symbol used in the
+ library. winldap.h redefines it to our commonly used value,
+ thus we define our usual macro here. */
+#ifdef HAVE_LDAP_START_TLS_SA
+# ifndef HAVE_LDAP_START_TLS_S
+# define HAVE_LDAP_START_TLS_S 1
+# endif
+#endif
+
+/* Provide the es_ macro for estream. */
+#define GPGRT_ENABLE_ES_MACROS 1
+
+/* Tell libgcrypt not to use its own libgpg-error implementation. */
+#define USE_LIBGPG_ERROR 1
+
+/* Tell Libgcrypt not to include deprecated definitions. */
+#define GCRYPT_NO_DEPRECATED 1
+
+/* Our HTTP code is used in estream mode. */
+#define HTTP_USE_ESTREAM 1
+
+/* Under W32 we do an explicit socket initialization, thus we need to
+ avoid the on-demand initialization which would also install an atexit
+ handler. */
+#define HTTP_NO_WSASTARTUP
+
+/* Under Windows we use the gettext code from libgpg-error. */
+#define GPG_ERR_ENABLE_GETTEXT_MACROS
+
+/* Under WindowsCE we use the strerror replacement from libgpg-error. */
+#define GPG_ERR_ENABLE_ERRNO_MACROS
+
+#endif /*GNUPG_CONFIG_H_INCLUDED*/
+
diff --cc configure
index 2d9dbf1,0000000..376b10e
mode 100755,000000..100755
--- a/configure
+++ b/configure
@@@ -1,17402 -1,0 +1,17616 @@@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for gnupg 2.1.9.
++# Generated by GNU Autoconf 2.69 for gnupg 2.1.10.
+#
+# Report bugs to <http://bugs.gnupg.org>.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
+fi
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
+else
+ as_have_required=no
+fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ as_found=:
+ case $as_dir in #(
+ /*)
+ for as_base in sh bash ksh sh5; do
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
+ done;;
+ esac
+ as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org and
+$0: http://bugs.gnupg.org about your system, including any
+$0: error possibly output before this message. Then install
+$0: a modern shell, or manually run the script under such a
+$0: shell if you do have one."
+ fi
+ exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
+ esac;;
+*)
+ ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
+ fi
+else
+ as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p='mkdir -p "$as_dir"'
+else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='gnupg'
+PACKAGE_TARNAME='gnupg'
- PACKAGE_VERSION='2.1.9'
- PACKAGE_STRING='gnupg 2.1.9'
++PACKAGE_VERSION='2.1.10'
++PACKAGE_STRING='gnupg 2.1.10'
+PACKAGE_BUGREPORT='http://bugs.gnupg.org'
+PACKAGE_URL=''
+
+ac_unique_file="sm/gpgsm.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+gt_needs=
+ac_header_list=
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+BUILD_HOSTNAME
+BUILD_TIMESTAMP
+BUILD_FILEVERSION
+BUILD_VERSION
+BUILD_REVISION
+RUN_GPG_TESTS_FALSE
+RUN_GPG_TESTS_TRUE
++USE_TOFU_FALSE
++USE_TOFU_TRUE
+NO_TRUST_MODELS_FALSE
+NO_TRUST_MODELS_TRUE
+ENABLE_CARD_SUPPORT_FALSE
+ENABLE_CARD_SUPPORT_TRUE
+BUILD_GPGTAR_FALSE
+BUILD_GPGTAR_TRUE
+BUILD_SYMCRYPTRUN_FALSE
+BUILD_SYMCRYPTRUN_TRUE
+BUILD_DOC_FALSE
+BUILD_DOC_TRUE
+BUILD_TOOLS_FALSE
+BUILD_TOOLS_TRUE
+BUILD_DIRMNGR_FALSE
+BUILD_DIRMNGR_TRUE
+BUILD_G13_FALSE
+BUILD_G13_TRUE
+BUILD_SCDAEMON_FALSE
+BUILD_SCDAEMON_TRUE
+BUILD_AGENT_FALSE
+BUILD_AGENT_TRUE
+BUILD_GPGSM_FALSE
+BUILD_GPGSM_TRUE
+BUILD_GPG_FALSE
+BUILD_GPG_TRUE
+W32SOCKLIBS
+NETLIBS
+CROSS_COMPILING_FALSE
+CROSS_COMPILING_TRUE
+LIBREADLINE
+ZLIBS
+ENABLE_BZIP2_SUPPORT_FALSE
+ENABLE_BZIP2_SUPPORT_TRUE
+DISABLE_REGEX_FALSE
+DISABLE_REGEX_TRUE
+SYS_SOCKET_H
+BUILD_INCLUDED_LIBINTL
+USE_INCLUDED_LIBINTL
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+INTL_MACOSX_LIBS
+XGETTEXT_EXTRA_OPTIONS
+MSGMERGE
+XGETTEXT_015
+XGETTEXT
+GMSGFMT_015
+MSGFMT_015
+GMSGFMT
+MSGFMT
+GETTEXT_MACRO_VERSION
+USE_NLS
+LTLIBICONV
+LIBICONV
+SENDMAIL
+USE_LDAPWRAPPER_FALSE
+USE_LDAPWRAPPER_TRUE
+USE_LDAP_FALSE
+USE_LDAP_TRUE
+LBER_LIBS
+LDAP_CPPFLAGS
+LDAPLIBS
+GPGKEYS_LDAP
+USE_DNS_SRV_FALSE
+USE_DNS_SRV_TRUE
+DNSLIBS
+LIBGNUTLS_LIBS
+LIBGNUTLS_CFLAGS
- PKG_CONFIG_LIBDIR
- PKG_CONFIG_PATH
- PKG_CONFIG
+NTBTLS_LIBS
+NTBTLS_CFLAGS
+NTBTLS_CONFIG
+NPTH_LIBS
+NPTH_CFLAGS
+NPTH_CONFIG
+SHRED
+LIBUTIL_LIBS
+FUSERMOUNT
+ENCFS
++SQLITE3_FALSE
++SQLITE3_TRUE
++SQLITE3_LIBS
++SQLITE3_CFLAGS
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
++PKG_CONFIG
+DL_LIBS
+LIBUSB_LIBS
+KSBA_LIBS
+KSBA_CFLAGS
+KSBA_CONFIG
+LIBASSUAN_LIBS
+LIBASSUAN_CFLAGS
+LIBASSUAN_CONFIG
+LIBGCRYPT_LIBS
+LIBGCRYPT_CFLAGS
+LIBGCRYPT_CONFIG
+GPG_ERROR_MT_LIBS
+GPG_ERROR_MT_CFLAGS
+GPG_ERROR_LIBS
+GPG_ERROR_CFLAGS
+GPG_ERROR_CONFIG
+RUN_TESTS_FALSE
+RUN_TESTS_TRUE
+HAVE_ANDROID_SYSTEM_FALSE
+HAVE_ANDROID_SYSTEM_TRUE
+HAVE_W32CE_SYSTEM_FALSE
+HAVE_W32CE_SYSTEM_TRUE
+HAVE_W32_SYSTEM_FALSE
+HAVE_W32_SYSTEM_TRUE
+USE_SIMPLE_GETTEXT_FALSE
+USE_SIMPLE_GETTEXT_TRUE
+HAVE_DOSISH_SYSTEM_FALSE
+HAVE_DOSISH_SYSTEM_TRUE
+CC_FOR_BUILD
+HAVE_USTAR_FALSE
+HAVE_USTAR_TRUE
+TAR
+WINDRES
+PERL
+AR
+RANLIB
+LN_S
+SYSROOT
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+GNUPG_DIRMNGR_LDAP_PGM_FALSE
+GNUPG_DIRMNGR_LDAP_PGM_TRUE
+GNUPG_DIRMNGR_LDAP_PGM
+GNUPG_PROTECT_TOOL_PGM_FALSE
+GNUPG_PROTECT_TOOL_PGM_TRUE
+GNUPG_PROTECT_TOOL_PGM
+GNUPG_DIRMNGR_PGM_FALSE
+GNUPG_DIRMNGR_PGM_TRUE
+GNUPG_DIRMNGR_PGM
+GNUPG_SCDAEMON_PGM_FALSE
+GNUPG_SCDAEMON_PGM_TRUE
+GNUPG_SCDAEMON_PGM
+GNUPG_PINENTRY_PGM_FALSE
+GNUPG_PINENTRY_PGM_TRUE
+GNUPG_PINENTRY_PGM
+GNUPG_AGENT_PGM_FALSE
+GNUPG_AGENT_PGM_TRUE
+GNUPG_AGENT_PGM
+PACKAGE_GT
+EGREP
+GREP
+CPP
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_dependency_tracking
+enable_gpg
+enable_gpgsm
+enable_scdaemon
+enable_g13
+enable_dirmngr
+enable_tools
+enable_doc
+enable_symcryptrun
+enable_gpgtar
+with_agent_pgm
+with_pinentry_pgm
+with_scdaemon_pgm
+with_dirmngr_pgm
+with_protect_tool_pgm
+with_dirmngr_ldap_pgm
+enable_gpg2_is_gpg
+enable_selinux_support
+enable_large_secmem
+enable_trust_models
++enable_tofu
+enable_gpg_rsa
+enable_gpg_ecdh
+enable_gpg_ecdsa
+enable_gpg_eddsa
+enable_gpg_idea
+enable_gpg_cast5
+enable_gpg_blowfish
+enable_gpg_aes128
+enable_gpg_aes192
+enable_gpg_aes256
+enable_gpg_twofish
+enable_gpg_camellia128
+enable_gpg_camellia192
+enable_gpg_camellia256
+enable_gpg_md5
+enable_gpg_rmd160
+enable_gpg_sha224
+enable_gpg_sha384
+enable_gpg_sha512
+enable_zip
+enable_bzip2
+enable_exec
+enable_photo_viewers
+with_photo_viewer
+enable_key_cache
+with_capabilities
+enable_card_support
+enable_ccid_driver
+enable_dirmngr_auto_start
+enable_maintainer_mode
+enable_largefile
+with_tar
+with_libgpg_error_prefix
+with_gpg_error_prefix
+with_libgcrypt_prefix
+with_libassuan_prefix
+with_ksba_prefix
++enable_sqlite
+with_npth_prefix
+enable_ntbtls
+with_ntbtls_prefix
+enable_gnutls
+with_adns
+enable_dns_srv
+enable_dns_cert
+enable_ldap
+with_ldap
+with_mailprog
+with_gnu_ld
+enable_rpath
+with_libiconv_prefix
+enable_nls
+with_libintl_prefix
+enable_endian_check
+enable_regex
+with_regex
+with_zlib
+with_bzip2
+with_readline
+enable_optimization
+enable_build_timestamp
+'
+ ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+SYSROOT
+CC_FOR_BUILD
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
++SQLITE3_CFLAGS
++SQLITE3_LIBS
+LIBGNUTLS_CFLAGS
+LIBGNUTLS_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+ # If the previous option needs an argument, assign it.
+ if test -n "$ac_prev"; then
+ eval $ac_prev=\$ac_option
+ ac_prev=
+ continue
+ fi
+
+ case $ac_option in
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+
+ case $ac_dashdash$ac_option in
+ --)
+ ac_dashdash=yes ;;
+
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir=$ac_optarg ;;
+
+ -build | --build | --buil | --bui | --bu)
+ ac_prev=build_alias ;;
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+ build_alias=$ac_optarg ;;
+
+ -cache-file | --cache-file | --cache-fil | --cache-fi \
+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+ ac_prev=cache_file ;;
+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+ cache_file=$ac_optarg ;;
+
+ --config-cache | -C)
+ cache_file=config.cache ;;
+
+ -datadir | --datadir | --datadi | --datad)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ datadir=$ac_optarg ;;
+
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
+ -disable-* | --disable-*)
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+ | --exec | --exe | --ex)
+ ac_prev=exec_prefix ;;
+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+ | --exec=* | --exe=* | --ex=*)
+ exec_prefix=$ac_optarg ;;
+
+ -gas | --gas | --ga | --g)
+ # Obsolete; use --with-gas.
+ with_gas=yes ;;
+
+ -help | --help | --hel | --he | -h)
+ ac_init_help=long ;;
+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+ ac_init_help=recursive ;;
+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+ ac_init_help=short ;;
+
+ -host | --host | --hos | --ho)
+ ac_prev=host_alias ;;
+ -host=* | --host=* | --hos=* | --ho=*)
+ host_alias=$ac_optarg ;;
+
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+ ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+ | --ht=*)
+ htmldir=$ac_optarg ;;
+
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir=$ac_optarg ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir=$ac_optarg ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ libdir=$ac_optarg ;;
+
+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+ | --libexe | --libex | --libe)
+ ac_prev=libexecdir ;;
+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir=$ac_optarg ;;
+
+ -localedir | --localedir | --localedi | --localed | --locale)
+ ac_prev=localedir ;;
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+ localedir=$ac_optarg ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst | --locals)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ localstatedir=$ac_optarg ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir=$ac_optarg ;;
+
+ -nfp | --nfp | --nf)
+ # Obsolete; use --without-fp.
+ with_fp=no ;;
+
+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+ | --no-cr | --no-c | -n)
+ no_create=yes ;;
+
+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+ no_recursion=yes ;;
+
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir=$ac_optarg ;;
+
+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+ ac_prev=prefix ;;
+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+ prefix=$ac_optarg ;;
+
+ -program-prefix | --program-prefix | --program-prefi | --program-pref \
+ | --program-pre | --program-pr | --program-p)
+ ac_prev=program_prefix ;;
+ -program-prefix=* | --program-prefix=* | --program-prefi=* \
+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+ program_prefix=$ac_optarg ;;
+
+ -program-suffix | --program-suffix | --program-suffi | --program-suff \
+ | --program-suf | --program-su | --program-s)
+ ac_prev=program_suffix ;;
+ -program-suffix=* | --program-suffix=* | --program-suffi=* \
+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+ program_suffix=$ac_optarg ;;
+
+ -program-transform-name | --program-transform-name \
+ | --program-transform-nam | --program-transform-na \
+ | --program-transform-n | --program-transform- \
+ | --program-transform | --program-transfor \
+ | --program-transfo | --program-transf \
+ | --program-trans | --program-tran \
+ | --progr-tra | --program-tr | --program-t)
+ ac_prev=program_transform_name ;;
+ -program-transform-name=* | --program-transform-name=* \
+ | --program-transform-nam=* | --program-transform-na=* \
+ | --program-transform-n=* | --program-transform-=* \
+ | --program-transform=* | --program-transfor=* \
+ | --program-transfo=* | --program-transf=* \
+ | --program-trans=* | --program-tran=* \
+ | --progr-tra=* | --program-tr=* | --program-t=*)
+ program_transform_name=$ac_optarg ;;
+
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+ ac_prev=pdfdir ;;
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+ pdfdir=$ac_optarg ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;;
+
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir=$ac_optarg ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir=$ac_optarg ;;
+
+ -site | --site | --sit)
+ ac_prev=site ;;
+ -site=* | --site=* | --sit=*)
+ site=$ac_optarg ;;
+
+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+ ac_prev=srcdir ;;
+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+ srcdir=$ac_optarg ;;
+
+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+ | --syscon | --sysco | --sysc | --sys | --sy)
+ ac_prev=sysconfdir ;;
+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+ sysconfdir=$ac_optarg ;;
+
+ -target | --target | --targe | --targ | --tar | --ta | --t)
+ ac_prev=target_alias ;;
+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+ target_alias=$ac_optarg ;;
+
+ -v | -verbose | --verbose | --verbos | --verbo | --verb)
+ verbose=yes ;;
+
+ -version | --version | --versio | --versi | --vers | -V)
+ ac_init_version=: ;;
+
+ -with-* | --with-*)
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
+
+ -without-* | --without-*)
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+ with_x=yes ;;
+
+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+ | --x-incl | --x-inc | --x-in | --x-i)
+ ac_prev=x_includes ;;
+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+ x_includes=$ac_optarg ;;
+
+ -x-libraries | --x-libraries | --x-librarie | --x-librari \
+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+ ac_prev=x_libraries ;;
+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+ ;;
+
+ *=*)
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+ # FIXME: should be removed in autoconf 3.0.
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ ;;
+
+ esac
+done
+
+if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+ as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
+do
+ eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+ as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+ # Try the directory containing this script, then the parent directory.
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ srcdir=$ac_confdir
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ srcdir=..
+ fi
+else
+ ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+ srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_env_${ac_var}_value=\$${ac_var}
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
- \`configure' configures gnupg 2.1.9 to adapt to many kinds of systems.
++\`configure' configures gnupg 2.1.10 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE. See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+ -h, --help display this help and exit
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+ [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/gnupg]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
+_ACEOF
+
+ cat <<\_ACEOF
+
+Program names:
+ --program-prefix=PREFIX prepend PREFIX to installed program names
+ --program-suffix=SUFFIX append SUFFIX to installed program names
+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+ case $ac_init_help in
- short | recursive ) echo "Configuration of gnupg 2.1.9:";;
++ short | recursive ) echo "Configuration of gnupg 2.1.10:";;
+ esac
+ cat <<\_ACEOF
+
+Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
+ --disable-gpg do not build the gpg program
+ --disable-gpgsm do not build the gpgsm program
+ --disable-scdaemon do not build the scdaemon program
- --disable-g13 do not build the g13 program
++ --enable-g13 build the g13 program
+ --disable-dirmngr do not build the dirmngr program
+ --disable-tools do not build the tools program
+ --disable-doc do not build the doc program
+ --enable-symcryptrun build the symcryptrun program
+ --disable-gpgtar do not build the gpgtar program
+ --enable-gpg2-is-gpg Set installed name of gpg2 to gpg
+ --enable-selinux-support
+ enable SELinux support
+ --enable-large-secmem allocate extra secure memory
+ --disable-trust-models disable all trust models except "always"
++ --disable-tofu disable the TOFU trust model
+ --disable-gpg-rsa disable the RSA public key algorithm in gpg
+ --disable-gpg-ecdh disable the ECDH public key algorithm in gpg
+ --disable-gpg-ecdsa disable the ECDSA public key algorithm in gpg
+ --disable-gpg-eddsa disable the EdDSA public key algorithm in gpg
+ --disable-gpg-idea disable the IDEA cipher algorithm in gpg
+ --disable-gpg-cast5 disable the CAST5 cipher algorithm in gpg
+ --disable-gpg-blowfish disable the BLOWFISH cipher algorithm in gpg
+ --disable-gpg-aes128 disable the AES128 cipher algorithm in gpg
+ --disable-gpg-aes192 disable the AES192 cipher algorithm in gpg
+ --disable-gpg-aes256 disable the AES256 cipher algorithm in gpg
+ --disable-gpg-twofish disable the TWOFISH cipher algorithm in gpg
+ --disable-gpg-camellia128
+ disable the CAMELLIA128 cipher algorithm in gpg
+ --disable-gpg-camellia192
+ disable the CAMELLIA192 cipher algorithm in gpg
+ --disable-gpg-camellia256
+ disable the CAMELLIA256 cipher algorithm in gpg
+ --disable-gpg-md5 disable the MD5 hash algorithm in gpg
+ --disable-gpg-rmd160 disable the RIPE-MD160 hash algorithm in gpg
+ --disable-gpg-sha224 disable the SHA-224 hash algorithm in gpg
+ --disable-gpg-sha384 disable the SHA-384 hash algorithm in gpg
+ --disable-gpg-sha512 disable the SHA-512 hash algorithm in gpg
+ --disable-zip disable the ZIP and ZLIB compression algorithm
+ --disable-bzip2 disable the BZIP2 compression algorithm
+ --disable-exec disable all external program execution
+ --disable-photo-viewers disable photo ID viewers
+ --enable-key-cache=SIZE Set key cache to SIZE (default 4096)
+ --disable-card-support disable smartcard support
+ --disable-ccid-driver disable the internal CCID driver
+ --disable-dirmngr-auto-start
+ disable auto starting of the dirmngr
+ --enable-maintainer-mode
+ enable make rules and dependencies not useful (and
+ sometimes confusing) to the casual installer
+ --disable-largefile omit support for large files
++ --disable-sqlite disable the use of SQLITE
+ --disable-ntbtls disable the use of NTBTLS as TLS library
+ --disable-gnutls disable GNUTLS as fallback TLS library
+ --disable-dns-srv disable the use of DNS SRV in HKP and HTTP
+ --disable-dns-cert disable the use of CERT records in DNS
+ --disable-ldap disable LDAP support
+ --disable-rpath do not hardcode runtime library paths
+ --disable-nls do not use Native Language Support
+ --disable-endian-check disable the endian check and trust the OS provided
+ macros
+ --disable-regex do not handle regular expressions in trust
+ signatures
+ --disable-optimization disable compiler optimization
+ --enable-build-timestamp
+ set an explicit build timestamp for reproducibility.
+ (default is the current time in ISO-8601 format)
+
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-agent-pgm=PATH Use PATH as the default for the agent)
+ --with-pinentry-pgm=PATH Use PATH as the default for the pinentry)
+ --with-scdaemon-pgm=PATH Use PATH as the default for the scdaemon)
+ --with-dirmngr-pgm=PATH Use PATH as the default for the dirmngr)
+ --with-protect-tool-pgm=PATH Use PATH as the default for the protect-tool)
+ --with-dirmngr-ldap-pgm=PATH Use PATH as the default for the dirmnge ldap wrapper)
+ --with-photo-viewer=FIXED_VIEWER set a fixed photo ID viewer
+ --with-capabilities use linux capabilities default=no
+ --with-tar=PATH look for a tar program in PATH
+ --with-libgpg-error-prefix=PFX
+ prefix where GPG Error is installed (optional)
+
+ --with-libgcrypt-prefix=PFX
+ prefix where LIBGCRYPT is installed (optional)
+ --with-libassuan-prefix=PFX
+ prefix where LIBASSUAN is installed (optional)
+ --with-ksba-prefix=PFX prefix where KSBA is installed (optional)
+ --with-npth-prefix=PFX prefix where NPTH is installed (optional)
+ --with-ntbtls-prefix=PFX
+ prefix where NTBTLS is installed (optional)
+ --with-adns=DIR look for the adns library in DIR
+ --with-ldap=DIR look for the LDAP library in DIR
+ --with-mailprog=NAME use "NAME -t" for mail transport
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
+ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+ --without-libintl-prefix don't search for libintl in includedir and libdir
+ --with-regex=DIR look for regex in DIR
+ --with-zlib=DIR use libz in DIR
+ --with-bzip2=DIR look for bzip2 in DIR
+ --with-readline=DIR look for the readline library in DIR
+
+Some influential environment variables:
+ CC C compiler command
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ SYSROOT locate config scripts also below that directory
+ CC_FOR_BUILD
+ build system C compiler
+ PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
++ SQLITE3_CFLAGS
++ C compiler flags for SQLITE3, overriding pkg-config
++ SQLITE3_LIBS
++ linker flags for SQLITE3, overriding pkg-config
+ LIBGNUTLS_CFLAGS
+ C compiler flags for LIBGNUTLS, overriding pkg-config
+ LIBGNUTLS_LIBS
+ linker flags for LIBGNUTLS, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <http://bugs.gnupg.org>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
+ ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
+ else
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+ cat <<\_ACEOF
- gnupg configure 2.1.9
++gnupg configure 2.1.10
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+ exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ------------------------------------ ##
+## Report this to http://bugs.gnupg.org ##
+## ------------------------------------ ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+ (void) $as_decl_use;
+#else
+ (void) $as_decl_name;
+#endif
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=$ac_mid; break
+else
+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_lo=$ac_mid; break
+else
+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=$ac_mid
+else
+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (($2) < 0)
+ {
+ long int i = longval ();
+ if (i != ($2))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ($2))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+ ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+ fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
- It was created by gnupg $as_me 2.1.9, which was
++It was created by gnupg $as_me 2.1.10, which was
+generated by GNU Autoconf 2.69. Invocation command line was
+
+ $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ $as_echo "PATH: $as_dir"
+ done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+ for ac_arg
+ do
+ case $ac_arg in
+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+ *\'*)
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+ 2)
+ as_fn_append ac_configure_args1 " '$ac_arg'"
+ if test $ac_must_keep_next = true; then
+ ac_must_keep_next=false # Got value, back to normal.
+ else
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+ as_fn_append ac_configure_args " '$ac_arg'"
+ ;;
+ esac
+ done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log. We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+ echo
+
+ $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
+ (set) 2>&1 |
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ sed -n \
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
+ *)
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+)
+ echo
+
+ $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+
+ if test -n "$ac_subst_files"; then
+ $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+
+ if test -s confdefs.h; then
+ $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+ echo
+ cat confdefs.h
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
+ } >&5
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
+elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+else
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+ test "x$ac_site_file" = xNONE && continue
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+done
+
+if test -r "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
+ esac
+ fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+fi
+
+gt_needs="$gt_needs need-ngettext"
+as_fn_append ac_header_list " sys/socket.h"
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+ esac
+ fi
+done
+if $ac_cache_corrupted; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+NEED_GPG_ERROR_VERSION=1.16
+
+NEED_LIBGCRYPT_API=1
+NEED_LIBGCRYPT_VERSION=1.6.0
+
+NEED_LIBASSUAN_API=2
- NEED_LIBASSUAN_VERSION=2.1.0
++NEED_LIBASSUAN_VERSION=2.4.1
+
+NEED_KSBA_API=1
+NEED_KSBA_VERSION=1.2.0
+
+NEED_NTBTLS_API=1
+NEED_NTBTLS_VERSION=0.1.0
+
+NEED_NPTH_API=1
+NEED_NPTH_VERSION=0.91
+
+
+NEED_GNUTLS_VERSION=3.0
+
++NEED_SQLITE_VERSION=3.7
+
+development_version=no
+PACKAGE=$PACKAGE_NAME
+PACKAGE_GT=${PACKAGE_NAME}2
+VERSION=$PACKAGE_VERSION
+
+ac_aux_dir=
+for ac_dir in build-aux "$srcdir"/build-aux; do
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+am__api_version='1.14'
+
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+
+ done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
+ test "$2" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
+else
+ am_missing_run=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+ if ${ac_cv_path_mkdir+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+ done
+IFS=$as_save_IFS
+
+fi
+
+ test -d ./--version && rmdir ./--version
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ MKDIR_P="$ac_install_sh -d"
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AWK="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ SET_MAKE=
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='gnupg'
- VERSION='2.1.9'
++ VERSION='2.1.10'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+fi
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: autobuild project... ${PACKAGE_NAME:-$PACKAGE}" >&5
+$as_echo "$as_me: autobuild project... ${PACKAGE_NAME:-$PACKAGE}" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: autobuild revision... ${PACKAGE_VERSION:-$VERSION}" >&5
+$as_echo "$as_me: autobuild revision... ${PACKAGE_VERSION:-$VERSION}" >&6;}
+ hostname=`hostname`
+ if test "$hostname"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: autobuild hostname... $hostname" >&5
+$as_echo "$as_me: autobuild hostname... $hostname" >&6;}
+ fi
+
+ date=`date +%Y%m%d-%H%M%S`
+ if test "$?" != 0; then
+ date=`date`
+ fi
+ if test "$date"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: autobuild timestamp... $date" >&5
+$as_echo "$as_me: autobuild timestamp... $date" >&6;}
+ fi
+
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+ enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+ am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link_default") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* )
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
+ break;;
+ * )
+ break;;
+ esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+ ac_file=''
+fi
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ break;;
+ * ) break;;
+ esac
+done
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+else
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+depcc="$CC" am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
+ MINIX=yes
+else
+ MINIX=
+fi
+
+
+ if test "$MINIX" = yes; then
+
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_safe_to_define___extensions__=yes
+else
+ ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+ test $ac_cv_safe_to_define___extensions__ = yes &&
+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+
+
+# Some status variables.
+have_gpg_error=no
+have_libgcrypt=no
+have_libassuan=no
+have_ksba=no
+have_ntbtls=no
+have_gnutls=no
++have_sqlite=no
+have_npth=no
+have_libusb=no
+have_adns=no
+gnupg_have_ldap="n/a"
+
+use_zip=yes
+use_bzip2=yes
+use_exec=yes
+use_trust_models=yes
++use_tofu=yes
+card_support=yes
+use_ccid_driver=yes
+dirmngr_auto_start=yes
+use_tls_library=no
+large_secmem=no
++show_tor_support=no
++
+
+build_gpg=yes
+
+ # Check whether --enable-gpg was given.
+if test "${enable_gpg+set}" = set; then :
+ enableval=$enable_gpg; build_gpg=$enableval
+else
+ build_gpg=yes
+fi
+
+
+ case "$build_gpg" in
+ no|yes)
+ ;;
+ *)
+ as_fn_error $? "only yes or no allowed for feature --enable-gpg" "$LINENO" 5
+ ;;
+ esac
+
+build_gpgsm=yes
+
+ # Check whether --enable-gpgsm was given.
+if test "${enable_gpgsm+set}" = set; then :
+ enableval=$enable_gpgsm; build_gpgsm=$enableval
+else
+ build_gpgsm=yes
+fi
+
+
+ case "$build_gpgsm" in
+ no|yes)
+ ;;
+ *)
+ as_fn_error $? "only yes or no allowed for feature --enable-gpgsm" "$LINENO" 5
+ ;;
+ esac
+
+# The agent is a required part and can't be disabled anymore.
+build_agent=yes
+build_scdaemon=yes
+
+ # Check whether --enable-scdaemon was given.
+if test "${enable_scdaemon+set}" = set; then :
+ enableval=$enable_scdaemon; build_scdaemon=$enableval
+else
+ build_scdaemon=yes
+fi
+
+
+ case "$build_scdaemon" in
+ no|yes)
+ ;;
+ *)
+ as_fn_error $? "only yes or no allowed for feature --enable-scdaemon" "$LINENO" 5
+ ;;
+ esac
+
- build_g13=yes
++build_g13=no
+
+ # Check whether --enable-g13 was given.
+if test "${enable_g13+set}" = set; then :
+ enableval=$enable_g13; build_g13=$enableval
+else
- build_g13=yes
++ build_g13=no
+fi
+
+
+ case "$build_g13" in
+ no|yes)
+ ;;
+ *)
+ as_fn_error $? "only yes or no allowed for feature --enable-g13" "$LINENO" 5
+ ;;
+ esac
+
+build_dirmngr=yes
+
+ # Check whether --enable-dirmngr was given.
+if test "${enable_dirmngr+set}" = set; then :
+ enableval=$enable_dirmngr; build_dirmngr=$enableval
+else
+ build_dirmngr=yes
+fi
+
+
+ case "$build_dirmngr" in
+ no|yes)
+ ;;
+ *)
+ as_fn_error $? "only yes or no allowed for feature --enable-dirmngr" "$LINENO" 5
+ ;;
+ esac
+
+build_tools=yes
+
+ # Check whether --enable-tools was given.
+if test "${enable_tools+set}" = set; then :
+ enableval=$enable_tools; build_tools=$enableval
+else
+ build_tools=yes
+fi
+
+
+ case "$build_tools" in
+ no|yes)
+ ;;
+ *)
+ as_fn_error $? "only yes or no allowed for feature --enable-tools" "$LINENO" 5
+ ;;
+ esac
+
+build_doc=yes
+
+ # Check whether --enable-doc was given.
+if test "${enable_doc+set}" = set; then :
+ enableval=$enable_doc; build_doc=$enableval
+else
+ build_doc=yes
+fi
+
+
+ case "$build_doc" in
+ no|yes)
+ ;;
+ *)
+ as_fn_error $? "only yes or no allowed for feature --enable-doc" "$LINENO" 5
+ ;;
+ esac
+
+build_symcryptrun=no
+
+ # Check whether --enable-symcryptrun was given.
+if test "${enable_symcryptrun+set}" = set; then :
+ enableval=$enable_symcryptrun; build_symcryptrun=$enableval
+else
+ build_symcryptrun=no
+fi
+
+
+ case "$build_symcryptrun" in
+ no|yes)
+ ;;
+ *)
+ as_fn_error $? "only yes or no allowed for feature --enable-symcryptrun" "$LINENO" 5
+ ;;
+ esac
+
+build_gpgtar=yes
+
+ # Check whether --enable-gpgtar was given.
+if test "${enable_gpgtar+set}" = set; then :
+ enableval=$enable_gpgtar; build_gpgtar=$enableval
+else
+ build_gpgtar=yes
+fi
+
+
+ case "$build_gpgtar" in
+ no|yes)
+ ;;
+ *)
+ as_fn_error $? "only yes or no allowed for feature --enable-gpgtar" "$LINENO" 5
+ ;;
+ esac
+
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_GT "$PACKAGE_GT"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define NEED_LIBGCRYPT_VERSION "$NEED_LIBGCRYPT_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define NEED_KSBA_VERSION "$NEED_KSBA_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define NEED_NTBTLS_VERSION "$NEED_NTBTLS_VERSION"
+_ACEOF
+
+
+
+
+# The default is to use the modules from this package and the few
+# other packages in a standard place; i.e where this package gets
+# installed. With these options it is possible to override these
+# ${prefix} depended values with fixed paths, which can't be replaced
+# at make time. See also am/cmacros.am and the defaults in AH_BOTTOM.
+
+# Check whether --with-agent-pgm was given.
+if test "${with_agent_pgm+set}" = set; then :
+ withval=$with_agent_pgm; GNUPG_AGENT_PGM="$withval"
+else
+ GNUPG_AGENT_PGM=""
+fi
+
+
+ if test -n "$GNUPG_AGENT_PGM"; then
+ GNUPG_AGENT_PGM_TRUE=
+ GNUPG_AGENT_PGM_FALSE='#'
+else
+ GNUPG_AGENT_PGM_TRUE='#'
+ GNUPG_AGENT_PGM_FALSE=
+fi
+
+show_gnupg_agent_pgm="(default)"
+test -n "$GNUPG_AGENT_PGM" && show_gnupg_agent_pgm="$GNUPG_AGENT_PGM"
+
+
+# Check whether --with-pinentry-pgm was given.
+if test "${with_pinentry_pgm+set}" = set; then :
+ withval=$with_pinentry_pgm; GNUPG_PINENTRY_PGM="$withval"
+else
+ GNUPG_PINENTRY_PGM=""
+fi
+
+
+ if test -n "$GNUPG_PINENTRY_PGM"; then
+ GNUPG_PINENTRY_PGM_TRUE=
+ GNUPG_PINENTRY_PGM_FALSE='#'
+else
+ GNUPG_PINENTRY_PGM_TRUE='#'
+ GNUPG_PINENTRY_PGM_FALSE=
+fi
+
+show_gnupg_pinentry_pgm="(default)"
+test -n "$GNUPG_PINENTRY_PGM" && show_gnupg_pinentry_pgm="$GNUPG_PINENTRY_PGM"
+
+
+
+# Check whether --with-scdaemon-pgm was given.
+if test "${with_scdaemon_pgm+set}" = set; then :
+ withval=$with_scdaemon_pgm; GNUPG_SCDAEMON_PGM="$withval"
+else
+ GNUPG_SCDAEMON_PGM=""
+fi
+
+
+ if test -n "$GNUPG_SCDAEMON_PGM"; then
+ GNUPG_SCDAEMON_PGM_TRUE=
+ GNUPG_SCDAEMON_PGM_FALSE='#'
+else
+ GNUPG_SCDAEMON_PGM_TRUE='#'
+ GNUPG_SCDAEMON_PGM_FALSE=
+fi
+
+show_gnupg_scdaemon_pgm="(default)"
+test -n "$GNUPG_SCDAEMON_PGM" && show_gnupg_scdaemon_pgm="$GNUPG_SCDAEMON_PGM"
+
+
+
+# Check whether --with-dirmngr-pgm was given.
+if test "${with_dirmngr_pgm+set}" = set; then :
+ withval=$with_dirmngr_pgm; GNUPG_DIRMNGR_PGM="$withval"
+else
+ GNUPG_DIRMNGR_PGM=""
+fi
+
+
+ if test -n "$GNUPG_DIRMNGR_PGM"; then
+ GNUPG_DIRMNGR_PGM_TRUE=
+ GNUPG_DIRMNGR_PGM_FALSE='#'
+else
+ GNUPG_DIRMNGR_PGM_TRUE='#'
+ GNUPG_DIRMNGR_PGM_FALSE=
+fi
+
+show_gnupg_dirmngr_pgm="(default)"
+test -n "$GNUPG_DIRMNGR_PGM" && show_gnupg_dirmngr_pgm="$GNUPG_DIRMNGR_PGM"
+
+
+# Check whether --with-protect-tool-pgm was given.
+if test "${with_protect_tool_pgm+set}" = set; then :
+ withval=$with_protect_tool_pgm; GNUPG_PROTECT_TOOL_PGM="$withval"
+else
+ GNUPG_PROTECT_TOOL_PGM=""
+fi
+
+
+ if test -n "$GNUPG_PROTECT_TOOL_PGM"; then
+ GNUPG_PROTECT_TOOL_PGM_TRUE=
+ GNUPG_PROTECT_TOOL_PGM_FALSE='#'
+else
+ GNUPG_PROTECT_TOOL_PGM_TRUE='#'
+ GNUPG_PROTECT_TOOL_PGM_FALSE=
+fi
+
+show_gnupg_protect_tool_pgm="(default)"
+test -n "$GNUPG_PROTECT_TOOL_PGM" \
+ && show_gnupg_protect_tool_pgm="$GNUPG_PROTECT_TOOL_PGM"
+
+
+# Check whether --with-dirmngr-ldap-pgm was given.
+if test "${with_dirmngr_ldap_pgm+set}" = set; then :
+ withval=$with_dirmngr_ldap_pgm; GNUPG_DIRMNGR_LDAP_PGM="$withval"
+else
+ GNUPG_DIRMNGR_LDAP_PGM=""
+fi
+
+
+ if test -n "$GNUPG_DIRMNGR_LDAP_PGM"; then
+ GNUPG_DIRMNGR_LDAP_PGM_TRUE=
+ GNUPG_DIRMNGR_LDAP_PGM_FALSE='#'
+else
+ GNUPG_DIRMNGR_LDAP_PGM_TRUE='#'
+ GNUPG_DIRMNGR_LDAP_PGM_FALSE=
+fi
+
+show_gnupg_dirmngr_ldap_pgm="(default)"
+test -n "$GNUPG_DIRMNGR_LDAP_PGM" \
+ && show_gnupg_dirmngr_ldap_pgm="$GNUPG_DIRMNGR_LDAP_PGM"
+
+#
+# On some platforms gpg2 is usually installed as gpg without using a
+# symlink. For correct operation of gpgconf it needs to know the
+# installed name of gpg. This option sets "gpg2"'s installed name to
+# just "gpg". Note that it might be required to rename gpg2 to gpg
+# manually after the build process.
+#
+# Check whether --enable-gpg2-is-gpg was given.
+if test "${enable_gpg2_is_gpg+set}" = set; then :
+ enableval=$enable_gpg2_is_gpg; gpg2_is_gpg=$enableval
+fi
+
+if test "$gpg2_is_gpg" = "yes"; then
+ name_of_installed_gpg=gpg
+else
+ name_of_installed_gpg=gpg2
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define NAME_OF_INSTALLED_GPG "$name_of_installed_gpg"
+_ACEOF
+
+
+
+# SELinux support includes tracking of sensitive files to avoid
+# leaking their contents through processing these files by gpg itself
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether SELinux support is requested" >&5
+$as_echo_n "checking whether SELinux support is requested... " >&6; }
+# Check whether --enable-selinux-support was given.
+if test "${enable_selinux_support+set}" = set; then :
+ enableval=$enable_selinux_support; selinux_support=$enableval
+else
+ selinux_support=no
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $selinux_support" >&5
+$as_echo "$selinux_support" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to allocate extra secure memory" >&5
+$as_echo_n "checking whether to allocate extra secure memory... " >&6; }
+# Check whether --enable-large-secmem was given.
+if test "${enable_large_secmem+set}" = set; then :
+ enableval=$enable_large_secmem; large_secmem=$enableval
+else
+ large_secmem=no
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $large_secmem" >&5
+$as_echo "$large_secmem" >&6; }
+if test "$large_secmem" = yes ; then
+ SECMEM_BUFFER_SIZE=65536
+else
+ SECMEM_BUFFER_SIZE=32768
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define SECMEM_BUFFER_SIZE $SECMEM_BUFFER_SIZE
+_ACEOF
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable trust models" >&5
+$as_echo_n "checking whether to enable trust models... " >&6; }
+# Check whether --enable-trust-models was given.
+if test "${enable_trust_models+set}" = set; then :
+ enableval=$enable_trust_models; use_trust_models=$enableval
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_trust_models" >&5
+$as_echo "$use_trust_models" >&6; }
+if test "$use_trust_models" = no ; then
+
+$as_echo "#define NO_TRUST_MODELS 1" >>confdefs.h
+
+fi
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable TOFU" >&5
++$as_echo_n "checking whether to enable TOFU... " >&6; }
++# Check whether --enable-tofu was given.
++if test "${enable_tofu+set}" = set; then :
++ enableval=$enable_tofu; use_tofu=$enableval
++else
++ use_tofu=yes
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_tofu" >&5
++$as_echo "$use_tofu" >&6; }
++
++
+
+#
+# Options to disable algorithm
+#
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the RSA public key for gpg" >&5
+$as_echo_n "checking whether to enable the RSA public key for gpg... " >&6; }
+ # Check whether --enable-gpg-rsa was given.
+if test "${enable_gpg_rsa+set}" = set; then :
+ enableval=$enable_gpg_rsa;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_RSA 1" >>confdefs.h
+
+ fi
+
+# Elgamal is a MUST algorithm
+# DSA is a MUST algorithm
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the ECDH public key for gpg" >&5
+$as_echo_n "checking whether to enable the ECDH public key for gpg... " >&6; }
+ # Check whether --enable-gpg-ecdh was given.
+if test "${enable_gpg_ecdh+set}" = set; then :
+ enableval=$enable_gpg_ecdh;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_ECDH 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the ECDSA public key for gpg" >&5
+$as_echo_n "checking whether to enable the ECDSA public key for gpg... " >&6; }
+ # Check whether --enable-gpg-ecdsa was given.
+if test "${enable_gpg_ecdsa+set}" = set; then :
+ enableval=$enable_gpg_ecdsa;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_ECDSA 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the EdDSA public key for gpg" >&5
+$as_echo_n "checking whether to enable the EdDSA public key for gpg... " >&6; }
+ # Check whether --enable-gpg-eddsa was given.
+if test "${enable_gpg_eddsa+set}" = set; then :
+ enableval=$enable_gpg_eddsa;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_EDDSA 1" >>confdefs.h
+
+ fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the IDEA cipher for gpg" >&5
+$as_echo_n "checking whether to enable the IDEA cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-idea was given.
+if test "${enable_gpg_idea+set}" = set; then :
+ enableval=$enable_gpg_idea;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_IDEA 1" >>confdefs.h
+
+ fi
+
+# 3DES is a MUST algorithm
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the CAST5 cipher for gpg" >&5
+$as_echo_n "checking whether to enable the CAST5 cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-cast5 was given.
+if test "${enable_gpg_cast5+set}" = set; then :
+ enableval=$enable_gpg_cast5;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_CAST5 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the BLOWFISH cipher for gpg" >&5
+$as_echo_n "checking whether to enable the BLOWFISH cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-blowfish was given.
+if test "${enable_gpg_blowfish+set}" = set; then :
+ enableval=$enable_gpg_blowfish;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_BLOWFISH 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the AES128 cipher for gpg" >&5
+$as_echo_n "checking whether to enable the AES128 cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-aes128 was given.
+if test "${enable_gpg_aes128+set}" = set; then :
+ enableval=$enable_gpg_aes128;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_AES128 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the AES192 cipher for gpg" >&5
+$as_echo_n "checking whether to enable the AES192 cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-aes192 was given.
+if test "${enable_gpg_aes192+set}" = set; then :
+ enableval=$enable_gpg_aes192;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_AES192 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the AES256 cipher for gpg" >&5
+$as_echo_n "checking whether to enable the AES256 cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-aes256 was given.
+if test "${enable_gpg_aes256+set}" = set; then :
+ enableval=$enable_gpg_aes256;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_AES256 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the TWOFISH cipher for gpg" >&5
+$as_echo_n "checking whether to enable the TWOFISH cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-twofish was given.
+if test "${enable_gpg_twofish+set}" = set; then :
+ enableval=$enable_gpg_twofish;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_TWOFISH 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the CAMELLIA128 cipher for gpg" >&5
+$as_echo_n "checking whether to enable the CAMELLIA128 cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-camellia128 was given.
+if test "${enable_gpg_camellia128+set}" = set; then :
+ enableval=$enable_gpg_camellia128;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_CAMELLIA128 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the CAMELLIA192 cipher for gpg" >&5
+$as_echo_n "checking whether to enable the CAMELLIA192 cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-camellia192 was given.
+if test "${enable_gpg_camellia192+set}" = set; then :
+ enableval=$enable_gpg_camellia192;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_CAMELLIA192 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the CAMELLIA256 cipher for gpg" >&5
+$as_echo_n "checking whether to enable the CAMELLIA256 cipher for gpg... " >&6; }
+ # Check whether --enable-gpg-camellia256 was given.
+if test "${enable_gpg_camellia256+set}" = set; then :
+ enableval=$enable_gpg_camellia256;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_CAMELLIA256 1" >>confdefs.h
+
+ fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the MD5 hash for gpg" >&5
+$as_echo_n "checking whether to enable the MD5 hash for gpg... " >&6; }
+ # Check whether --enable-gpg-md5 was given.
+if test "${enable_gpg_md5+set}" = set; then :
+ enableval=$enable_gpg_md5;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_MD5 1" >>confdefs.h
+
+ fi
+
+# SHA1 is a MUST algorithm
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the RIPE-MD160 hash for gpg" >&5
+$as_echo_n "checking whether to enable the RIPE-MD160 hash for gpg... " >&6; }
+ # Check whether --enable-gpg-rmd160 was given.
+if test "${enable_gpg_rmd160+set}" = set; then :
+ enableval=$enable_gpg_rmd160;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_RMD160 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the SHA-224 hash for gpg" >&5
+$as_echo_n "checking whether to enable the SHA-224 hash for gpg... " >&6; }
+ # Check whether --enable-gpg-sha224 was given.
+if test "${enable_gpg_sha224+set}" = set; then :
+ enableval=$enable_gpg_sha224;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_SHA224 1" >>confdefs.h
+
+ fi
+
+# SHA256 is a MUST algorithm for GnuPG.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the SHA-384 hash for gpg" >&5
+$as_echo_n "checking whether to enable the SHA-384 hash for gpg... " >&6; }
+ # Check whether --enable-gpg-sha384 was given.
+if test "${enable_gpg_sha384+set}" = set; then :
+ enableval=$enable_gpg_sha384;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_SHA384 1" >>confdefs.h
+
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the SHA-512 hash for gpg" >&5
+$as_echo_n "checking whether to enable the SHA-512 hash for gpg... " >&6; }
+ # Check whether --enable-gpg-sha512 was given.
+if test "${enable_gpg_sha512+set}" = set; then :
+ enableval=$enable_gpg_sha512;
+else
+ enableval=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+ if test x"$enableval" = xyes ; then
+
+$as_echo "#define GPG_USE_SHA512 1" >>confdefs.h
+
+ fi
+
+
+
+# Allow disabling of zip support.
+# This is in general not a good idea because according to rfc4880 OpenPGP
+# implementations SHOULD support ZLIB.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the ZIP and ZLIB compression algorithm" >&5
+$as_echo_n "checking whether to enable the ZIP and ZLIB compression algorithm... " >&6; }
+# Check whether --enable-zip was given.
+if test "${enable_zip+set}" = set; then :
+ enableval=$enable_zip; use_zip=$enableval
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_zip" >&5
+$as_echo "$use_zip" >&6; }
+
+# Allow disabling of bzib2 support.
+# It is defined only after we confirm the library is available later
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the BZIP2 compression algorithm" >&5
+$as_echo_n "checking whether to enable the BZIP2 compression algorithm... " >&6; }
+# Check whether --enable-bzip2 was given.
+if test "${enable_bzip2+set}" = set; then :
+ enableval=$enable_bzip2; use_bzip2=$enableval
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_bzip2" >&5
+$as_echo "$use_bzip2" >&6; }
+
+# Configure option to allow or disallow execution of external
+# programs, like a photo viewer.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable external program execution" >&5
+$as_echo_n "checking whether to enable external program execution... " >&6; }
+# Check whether --enable-exec was given.
+if test "${enable_exec+set}" = set; then :
+ enableval=$enable_exec; use_exec=$enableval
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_exec" >&5
+$as_echo "$use_exec" >&6; }
+if test "$use_exec" = no ; then
+
+$as_echo "#define NO_EXEC 1" >>confdefs.h
+
+fi
+
+if test "$use_exec" = yes ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable photo ID viewing" >&5
+$as_echo_n "checking whether to enable photo ID viewing... " >&6; }
+ # Check whether --enable-photo-viewers was given.
+if test "${enable_photo_viewers+set}" = set; then :
+ enableval=$enable_photo_viewers; if test "$enableval" = no ; then
+
+$as_echo "#define DISABLE_PHOTO_VIEWER 1" >>confdefs.h
+
+ fi
+else
+ enableval=yes
+fi
+
+ gnupg_cv_enable_photo_viewers=$enableval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+
+ if test "$gnupg_cv_enable_photo_viewers" = yes ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use a fixed photo ID viewer" >&5
+$as_echo_n "checking whether to use a fixed photo ID viewer... " >&6; }
+
+# Check whether --with-photo-viewer was given.
+if test "${with_photo_viewer+set}" = set; then :
+ withval=$with_photo_viewer; if test "$withval" = yes ; then
+ withval=no
+ elif test "$withval" != no ; then
+
+cat >>confdefs.h <<_ACEOF
+#define FIXED_PHOTO_VIEWER "$withval"
+_ACEOF
+
+ fi
+else
+ withval=no
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+$as_echo "$withval" >&6; }
+ fi
+fi
+
+
+#
+# Check for the key/uid cache size. This can't be zero, but can be
+# pretty small on embedded systems. This is used for the gpg part.
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the size of the key and uid cache" >&5
+$as_echo_n "checking for the size of the key and uid cache... " >&6; }
+# Check whether --enable-key-cache was given.
+if test "${enable_key_cache+set}" = set; then :
+ enableval=$enable_key_cache;
+else
+ enableval=4096
+fi
+
+if test "$enableval" = "no"; then
+ enableval=5
+elif test "$enableval" = "yes" || test "$enableval" = ""; then
+ enableval=4096
+fi
+key_cache_size=`echo "$enableval" | sed 's/[A-Za-z]//g'`
+if test "$enableval" != "$key_cache_size" || test "$key_cache_size" -lt 5; then
+ as_fn_error $? "invalid key-cache size" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $key_cache_size" >&5
+$as_echo "$key_cache_size" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PK_UID_CACHE_SIZE $key_cache_size
+_ACEOF
+
+
+
+
+#
+# Check whether we want to use Linux capabilities
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether use of capabilities is requested" >&5
+$as_echo_n "checking whether use of capabilities is requested... " >&6; }
+
+# Check whether --with-capabilities was given.
+if test "${with_capabilities+set}" = set; then :
+ withval=$with_capabilities; use_capabilities="$withval"
+else
+ use_capabilities=no
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_capabilities" >&5
+$as_echo "$use_capabilities" >&6; }
+
+#
+# Check whether to disable the card support
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether smartcard support is requested" >&5
+$as_echo_n "checking whether smartcard support is requested... " >&6; }
+# Check whether --enable-card-support was given.
+if test "${enable_card_support+set}" = set; then :
+ enableval=$enable_card_support; card_support=$enableval
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $card_support" >&5
+$as_echo "$card_support" >&6; }
+if test "$card_support" = yes ; then
+
+$as_echo "#define ENABLE_CARD_SUPPORT 1" >>confdefs.h
+
+else
+ build_scdaemon=no
+fi
+
+#
+# Allow disabling of internal CCID support.
+# It is defined only after we confirm the library is available later
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the internal CCID driver" >&5
+$as_echo_n "checking whether to enable the internal CCID driver... " >&6; }
+# Check whether --enable-ccid-driver was given.
+if test "${enable_ccid_driver+set}" = set; then :
+ enableval=$enable_ccid_driver; use_ccid_driver=$enableval
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_ccid_driver" >&5
+$as_echo "$use_ccid_driver" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to auto start dirmngr" >&5
+$as_echo_n "checking whether to auto start dirmngr... " >&6; }
+# Check whether --enable-dirmngr-auto-start was given.
+if test "${enable_dirmngr_auto_start+set}" = set; then :
+ enableval=$enable_dirmngr_auto_start; dirmngr_auto_start=$enableval
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dirmngr_auto_start" >&5
+$as_echo "$dirmngr_auto_start" >&6; }
+if test "$dirmngr_auto_start" = yes ; then
+
+$as_echo "#define USE_DIRMNGR_AUTO_START 1" >>confdefs.h
+
+fi
+
+
+#
+# To avoid double inclusion of config.h which might happen at some
+# places, we add the usual double inclusion protection at the top of
+# config.h.
+#
+
+
+#
+# Stuff which goes at the bottom of config.h.
+#
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+ # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+
+# Checks for programs.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for programs" >&5
+$as_echo "$as_me: checking for programs" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ SET_MAKE=
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
+ test "$2" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+missing_dir=`cd $ac_aux_dir && pwd`
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+for ac_prog in gawk mawk nawk awk
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AWK="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$AWK" && break
+done
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+else
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+depcc="$CC" am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+if test "x$ac_cv_prog_cc_c89" = "xno" ; then
+ as_fn_error $? "No C-89 compiler found" "$LINENO" 5
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
+else
+ RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="ar"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_AR" = x; then
+ AR=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+else
+ AR="$ac_cv_prog_AR"
+fi
+
+# Extract the first word of ""perl"", so it can be a program name with args.
+set dummy "perl"; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PERL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PERL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+if test -n "$PERL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ac_tool_prefix}windres; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_WINDRES+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$WINDRES"; then
+ ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDRES=$ac_cv_prog_WINDRES
+if test -n "$WINDRES"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_WINDRES"; then
+ ac_ct_WINDRES=$WINDRES
+ # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_WINDRES"; then
+ ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_WINDRES="windres"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
+if test -n "$ac_ct_WINDRES"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+$as_echo "$ac_ct_WINDRES" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_WINDRES" = x; then
+ WINDRES=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ WINDRES=$ac_ct_WINDRES
+ fi
+else
+ WINDRES="$ac_cv_prog_WINDRES"
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5
+$as_echo_n "checking for strerror in -lcposix... " >&6; }
+if ${ac_cv_lib_cposix_strerror+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcposix $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_cposix_strerror=yes
+else
+ ac_cv_lib_cposix_strerror=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5
+$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
+if test "x$ac_cv_lib_cposix_strerror" = xyes; then :
+ LIBS="$LIBS -lcposix"
+fi
+
+
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+ enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_sys_largefile_CC=no
+ if test "$GCC" != yes; then
+ ac_save_CC=$CC
+ while :; do
+ # IRIX 6.2 and later do not support large files by default,
+ # so use the C compiler's -n32 option if that helps.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+ break
+fi
+rm -f core conftest.err conftest.$ac_objext
+ CC="$CC -n32"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+ break
+ done
+ CC=$ac_save_CC
+ rm -f conftest.$ac_ext
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+ if test "$ac_cv_sys_largefile_CC" != no; then
+ CC=$CC$ac_cv_sys_largefile_CC
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_file_offset_bits=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ if test $ac_cv_sys_file_offset_bits = unknown; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_large_files=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ fi
+
+
+fi
+
+
+
+# Check whether --with-tar was given.
+if test "${with_tar+set}" = set; then :
+ withval=$with_tar; _do_tar=$withval
+fi
+
+
+ if test x$_do_tar != xno ; then
+
+ if test x$_do_tar = x ; then
+ # Extract the first word of ""tar"", so it can be a program name with args.
+set dummy "tar"; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_TAR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $TAR in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+TAR=$ac_cv_path_TAR
+if test -n "$TAR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
+$as_echo "$TAR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ _mytar=$ac_cv_path_TAR
+ fi
+
+ # Check if our tar is ustar format. If so, it's good. TODO: Add some
+ # code to check various options, etc, to try and create ustar
+ # format.
+
+ if test x$_mytar != x ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $_mytar speaks USTAR" >&5
+$as_echo_n "checking whether $_mytar speaks USTAR... " >&6; }
+ echo hithere > conftest.txt
+ $_mytar -cf - conftest.txt | (dd skip=257 bs=1 count=5 2>/dev/null || cat) | grep ustar > /dev/null
+ _tar_bad=$?
+ rm conftest.txt
+
+ if test x$_tar_bad = x0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ fi
+ fi
+
+ if test x$_tar_bad = x0; then
+ HAVE_USTAR_TRUE=
+ HAVE_USTAR_FALSE='#'
+else
+ HAVE_USTAR_TRUE='#'
+ HAVE_USTAR_FALSE=
+fi
+
+
+
+# We need to compile and run a program on the build machine. A
+# comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in
+# the AC archive is broken for autoconf 2.57. Given that there is no
+# newer version of that macro, we assume that it is also broken for
+# autoconf 2.61 and thus we use a simple but usually sufficient
+# approach.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cc for build" >&5
+$as_echo_n "checking for cc for build... " >&6; }
+if test "$cross_compiling" = "yes"; then
+ CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
+else
+ CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5
+$as_echo "$CC_FOR_BUILD" >&6; }
+
+
+
+
+try_gettext=yes
+require_iconv=yes
+have_dosish_system=no
+have_w32_system=no
+have_w32ce_system=no
+have_android_system=no
+run_tests=yes
+use_simple_gettext=no
+use_ldapwrapper=yes
+mmap_needed=yes
+case "${host}" in
+ *-mingw32*)
+ # special stuff for Windoze NT
+ ac_cv_have_dev_random=no
+
+$as_echo "#define USE_ONLY_8DOT3 1" >>confdefs.h
+
+
+$as_echo "#define USE_SIMPLE_GETTEXT 1" >>confdefs.h
+
+ have_dosish_system=yes
+ have_w32_system=yes
+ run_tests=no
+ use_ldapwrapper=no # Fixme: Do this only for CE.
+ case "${host}" in
+ *-mingw32ce*)
+ have_w32ce_system=yes
+ ;;
+ *)
+
+$as_echo "#define HAVE_DRIVE_LETTERS 1" >>confdefs.h
+
+ ;;
+ esac
+ try_gettext="no"
+ use_simple_gettext=yes
+ mmap_needed=no
+ ;;
+ i?86-emx-os2 | i?86-*-os2*emx )
+ # OS/2 with the EMX environment
+ ac_cv_have_dev_random=no
+ $as_echo "#define HAVE_DRIVE_LETTERS 1" >>confdefs.h
+
+ have_dosish_system=yes
+ try_gettext="no"
+ ;;
+
+ i?86-*-msdosdjgpp*)
+ # DOS with the DJGPP environment
+ ac_cv_have_dev_random=no
+ $as_echo "#define HAVE_DRIVE_LETTERS 1" >>confdefs.h
+
+ have_dosish_system=yes
+ try_gettext="no"
+ ;;
+
+ *-*-hpux*)
+ if test -z "$GCC" ; then
- CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
++ CFLAGS="-Ae -D_HPUX_SOURCE $CFLAGS"
+ fi
+ ;;
+ *-dec-osf4*)
+ if test -z "$GCC" ; then
+ # Suppress all warnings
+ # to get rid of the unsigned/signed char mismatch warnings.
- CFLAGS="$CFLAGS -w"
++ CFLAGS="-w $CFLAGS"
+ fi
+ ;;
+ *-dec-osf5*)
+ if test -z "$GCC" ; then
+ # Use the newer compiler `-msg_disable ptrmismatch1' to
+ # get rid of the unsigned/signed char mismatch warnings.
+ # Using this may hide other pointer mismatch warnings, but
+ # it at least lets other warning classes through
- CFLAGS="$CFLAGS -msg_disable ptrmismatch1"
++ CFLAGS="-msg_disable ptrmismatch1 $CFLAGS"
+ fi
+ ;;
+ m68k-atari-mint)
+ ;;
+ *-linux-androideabi)
+ have_android_system=yes
+ # Android is fully utf-8 and we do not want to use iconv to
+ # keeps things simple
+ require_iconv=no
+ run_tests=no
+ ;;
+ *)
+ ;;
+esac
+
+if test "$have_dosish_system" = yes; then
+
+$as_echo "#define HAVE_DOSISH_SYSTEM 1" >>confdefs.h
+
+fi
+ if test "$have_dosish_system" = yes; then
+ HAVE_DOSISH_SYSTEM_TRUE=
+ HAVE_DOSISH_SYSTEM_FALSE='#'
+else
+ HAVE_DOSISH_SYSTEM_TRUE='#'
+ HAVE_DOSISH_SYSTEM_FALSE=
+fi
+
+
+ if test x"$use_simple_gettext" = xyes; then
+ USE_SIMPLE_GETTEXT_TRUE=
+ USE_SIMPLE_GETTEXT_FALSE='#'
+else
+ USE_SIMPLE_GETTEXT_TRUE='#'
+ USE_SIMPLE_GETTEXT_FALSE=
+fi
+
+
+if test "$have_w32_system" = yes; then
+
+$as_echo "#define HAVE_W32_SYSTEM 1" >>confdefs.h
+
+ if test "$have_w32ce_system" = yes; then
+
+$as_echo "#define HAVE_W32CE_SYSTEM 1" >>confdefs.h
+
+ fi
+fi
+ if test "$have_w32_system" = yes; then
+ HAVE_W32_SYSTEM_TRUE=
+ HAVE_W32_SYSTEM_FALSE='#'
+else
+ HAVE_W32_SYSTEM_TRUE='#'
+ HAVE_W32_SYSTEM_FALSE=
+fi
+
+ if test "$have_w32ce_system" = yes; then
+ HAVE_W32CE_SYSTEM_TRUE=
+ HAVE_W32CE_SYSTEM_FALSE='#'
+else
+ HAVE_W32CE_SYSTEM_TRUE='#'
+ HAVE_W32CE_SYSTEM_FALSE=
+fi
+
+
+if test "$have_android_system" = yes; then
+
+$as_echo "#define HAVE_ANDROID_SYSTEM 1" >>confdefs.h
+
+fi
+ if test "$have_android_system" = yes; then
+ HAVE_ANDROID_SYSTEM_TRUE=
+ HAVE_ANDROID_SYSTEM_FALSE='#'
+else
+ HAVE_ANDROID_SYSTEM_TRUE='#'
+ HAVE_ANDROID_SYSTEM_FALSE=
+fi
+
+
+if test "$run_tests" = yes; then
+
+$as_echo "#define RUN_TESTS 1" >>confdefs.h
+
+fi
+ if test "$run_tests" = yes; then
+ RUN_TESTS_TRUE=
+ RUN_TESTS_FALSE='#'
+else
+ RUN_TESTS_TRUE='#'
+ RUN_TESTS_FALSE=
+fi
+
+
+
+# (These need to go after AC_PROG_CC so that $EXEEXT is defined)
+
+cat >>confdefs.h <<_ACEOF
+#define EXEEXT "$EXEEXT"
+_ACEOF
+
+
+
+#
+# Checks for libraries.
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries" >&5
+$as_echo "$as_me: checking for libraries" >&6;}
+
+
+#
+# libgpg-error is a library with error codes shared between GnuPG
+# related projects.
+#
+
+ gpg_error_config_prefix=""
+
+# Check whether --with-libgpg-error-prefix was given.
+if test "${with_libgpg_error_prefix+set}" = set; then :
+ withval=$with_libgpg_error_prefix; gpg_error_config_prefix="$withval"
+fi
+
+
+
+# Check whether --with-gpg-error-prefix was given.
+if test "${with_gpg_error_prefix+set}" = set; then :
+ withval=$with_gpg_error_prefix; gpg_error_config_prefix="$withval"
+fi
+
+
+ if test x"${GPG_ERROR_CONFIG}" = x ; then
+ if test x"${gpg_error_config_prefix}" != x ; then
+ GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
+ else
+ case "${SYSROOT}" in
+ /*)
+ if test -x "${SYSROOT}/bin/gpg-error-config" ; then
+ GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
+ fi
+ ;;
+ '')
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
+$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
+ ;;
+ esac
+ fi
+ fi
+
+ # Extract the first word of "gpg-error-config", so it can be a program name with args.
+set dummy gpg-error-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GPG_ERROR_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GPG_ERROR_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GPG_ERROR_CONFIG="$GPG_ERROR_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GPG_ERROR_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GPG_ERROR_CONFIG" && ac_cv_path_GPG_ERROR_CONFIG="no"
+ ;;
+esac
+fi
+GPG_ERROR_CONFIG=$ac_cv_path_GPG_ERROR_CONFIG
+if test -n "$GPG_ERROR_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG_ERROR_CONFIG" >&5
+$as_echo "$GPG_ERROR_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ min_gpg_error_version="$NEED_GPG_ERROR_VERSION"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5
+$as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; }
+ ok=no
+ if test "$GPG_ERROR_CONFIG" != "no" \
+ && test -f "$GPG_ERROR_CONFIG" ; then
+ req_major=`echo $min_gpg_error_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)/\1/'`
+ req_minor=`echo $min_gpg_error_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)/\2/'`
+ gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
+ major=`echo $gpg_error_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
+ minor=`echo $gpg_error_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
+ if test "$major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$major" -eq "$req_major"; then
+ if test "$minor" -ge "$req_minor"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
+ GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
+ GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
+ GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($gpg_error_config_version)" >&5
+$as_echo "yes ($gpg_error_config_version)" >&6; }
+ have_gpg_error=yes
+ gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
+ if test x"$gpg_error_config_host" != xnone ; then
+ if test x"$gpg_error_config_host" != x"$host" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** The config script $GPG_ERROR_CONFIG was
+*** built for $gpg_error_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-gpg-error-prefix
+*** to specify a matching config script or use \$SYSROOT.
+***" >&5
+$as_echo "$as_me: WARNING:
+***
+*** The config script $GPG_ERROR_CONFIG was
+*** built for $gpg_error_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-gpg-error-prefix
+*** to specify a matching config script or use \$SYSROOT.
+***" >&2;}
+ gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
+ fi
+ fi
+ else
+ GPG_ERROR_CFLAGS=""
+ GPG_ERROR_LIBS=""
+ GPG_ERROR_MT_CFLAGS=""
+ GPG_ERROR_MT_LIBS=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_gpg_error=no
+ fi
+
+
+
+
+
+
+
+#
+# Libgcrypt is our generic crypto library
+#
+
+
+# Check whether --with-libgcrypt-prefix was given.
+if test "${with_libgcrypt_prefix+set}" = set; then :
+ withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval"
+else
+ libgcrypt_config_prefix=""
+fi
+
+ if test x"${LIBGCRYPT_CONFIG}" = x ; then
+ if test x"${libgcrypt_config_prefix}" != x ; then
+ LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
+ else
+ case "${SYSROOT}" in
+ /*)
+ if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
+ LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
+ fi
+ ;;
+ '')
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
+$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
+ ;;
+ esac
+ fi
+ fi
+
+ # Extract the first word of "libgcrypt-config", so it can be a program name with args.
+set dummy libgcrypt-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_LIBGCRYPT_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $LIBGCRYPT_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no"
+ ;;
+esac
+fi
+LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
+if test -n "$LIBGCRYPT_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5
+$as_echo "$LIBGCRYPT_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ tmp="$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION"
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_libgcrypt_api=0
+ min_libgcrypt_version="$tmp"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5
+$as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6; }
+ ok=no
+ if test "$LIBGCRYPT_CONFIG" != "no" ; then
+ req_major=`echo $min_libgcrypt_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+ req_minor=`echo $min_libgcrypt_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+ req_micro=`echo $min_libgcrypt_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+ major=`echo $libgcrypt_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
+ minor=`echo $libgcrypt_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
+ micro=`echo $libgcrypt_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+ if test "$major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$major" -eq "$req_major"; then
+ if test "$minor" -gt "$req_minor"; then
+ ok=yes
+ else
+ if test "$minor" -eq "$req_minor"; then
+ if test "$micro" -ge "$req_micro"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libgcrypt_config_version)" >&5
+$as_echo "yes ($libgcrypt_config_version)" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ if test $ok = yes; then
+ # If we have a recent libgcrypt, we should also check that the
+ # API is compatible
+ if test "$req_libgcrypt_api" -gt 0 ; then
+ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5
+$as_echo_n "checking LIBGCRYPT API version... " >&6; }
+ if test "$req_libgcrypt_api" -eq "$tmp" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
+$as_echo "okay" >&6; }
+ else
+ ok=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5
+$as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; }
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+ have_libgcrypt=yes
+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+ if test x"$libgcrypt_config_host" != xnone ; then
+ if test x"$libgcrypt_config_host" != x"$host" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** The config script $LIBGCRYPT_CONFIG was
+*** built for $libgcrypt_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libgcrypt-prefix
+*** to specify a matching config script or use \$SYSROOT.
+***" >&5
+$as_echo "$as_me: WARNING:
+***
+*** The config script $LIBGCRYPT_CONFIG was
+*** built for $libgcrypt_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libgcrypt-prefix
+*** to specify a matching config script or use \$SYSROOT.
+***" >&2;}
+ gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
+ fi
+ fi
+ else
+ LIBGCRYPT_CFLAGS=""
+ LIBGCRYPT_LIBS=""
+ have_libgcrypt=no
+ fi
+
+
+
+
+
+#
+# libassuan is used for IPC
+#
+
+# Check whether --with-libassuan-prefix was given.
+if test "${with_libassuan_prefix+set}" = set; then :
+ withval=$with_libassuan_prefix; libassuan_config_prefix="$withval"
+else
+ libassuan_config_prefix=""
+fi
+
+ if test x$libassuan_config_prefix != x ; then
+ libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
+ if test x${LIBASSUAN_CONFIG+set} != xset ; then
+ LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
+ fi
+ fi
+ # Extract the first word of "libassuan-config", so it can be a program name with args.
+set dummy libassuan-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_LIBASSUAN_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $LIBASSUAN_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_LIBASSUAN_CONFIG="$LIBASSUAN_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_LIBASSUAN_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_LIBASSUAN_CONFIG" && ac_cv_path_LIBASSUAN_CONFIG="no"
+ ;;
+esac
+fi
+LIBASSUAN_CONFIG=$ac_cv_path_LIBASSUAN_CONFIG
+if test -n "$LIBASSUAN_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBASSUAN_CONFIG" >&5
+$as_echo "$LIBASSUAN_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+ tmp="$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION"
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_libassuan_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_libassuan_api=0
+ min_libassuan_version="$tmp"
+ fi
+
+ if test "$LIBASSUAN_CONFIG" != "no" ; then
+ libassuan_version=`$LIBASSUAN_CONFIG --version`
+ fi
+ libassuan_version_major=`echo $libassuan_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
+ libassuan_version_minor=`echo $libassuan_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
+ libassuan_version_micro=`echo $libassuan_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBASSUAN - version >= $min_libassuan_version" >&5
+$as_echo_n "checking for LIBASSUAN - version >= $min_libassuan_version... " >&6; }
+ ok=no
+ if test "$LIBASSUAN_CONFIG" != "no" ; then
+
+ req_major=`echo $min_libassuan_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+ req_minor=`echo $min_libassuan_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+ req_micro=`echo $min_libassuan_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+ if test "$libassuan_version_major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$libassuan_version_major" -eq "$req_major"; then
+ if test "$libassuan_version_minor" -gt "$req_minor"; then
+ ok=yes
+ else
+ if test "$libassuan_version_minor" -eq "$req_minor"; then
+ if test "$libassuan_version_micro" -ge "$req_micro"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+
+ fi
+
+ if test $ok = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libassuan_version)" >&5
+$as_echo "yes ($libassuan_version)" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+
+ if test $ok = yes; then
+ if test "$req_libassuan_api" -gt 0 ; then
+ tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBASSUAN API version" >&5
+$as_echo_n "checking LIBASSUAN API version... " >&6; }
+ if test "$req_libassuan_api" -eq "$tmp" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
+$as_echo "okay" >&6; }
+ else
+ ok=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libassuan_api got=$tmp." >&5
+$as_echo "does not match. want=$req_libassuan_api got=$tmp." >&6; }
+ fi
+ fi
+ fi
+ fi
+
+
+ if test $ok = yes; then
+ LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
+ LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+ have_libassuan=yes
+ else
+ LIBASSUAN_CFLAGS=""
+ LIBASSUAN_LIBS=""
+ have_libassuan=no
+ fi
+
+
+
+if test "$have_libassuan" = "yes"; then
+
+cat >>confdefs.h <<_ACEOF
+#define GNUPG_LIBASSUAN_VERSION "$libassuan_version"
+_ACEOF
+
++ show_tor_support="only .onion"
+fi
+
+
-
+#
+# libksba is our X.509 support library
+#
+
+
+# Check whether --with-ksba-prefix was given.
+if test "${with_ksba_prefix+set}" = set; then :
+ withval=$with_ksba_prefix; ksba_config_prefix="$withval"
+else
+ ksba_config_prefix=""
+fi
+
+ if test x$ksba_config_prefix != x ; then
+ ksba_config_args="$ksba_config_args --prefix=$ksba_config_prefix"
+ if test x${KSBA_CONFIG+set} != xset ; then
+ KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
+ fi
+ fi
+
+ # Extract the first word of "ksba-config", so it can be a program name with args.
+set dummy ksba-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_KSBA_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $KSBA_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_KSBA_CONFIG="$KSBA_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_KSBA_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_KSBA_CONFIG" && ac_cv_path_KSBA_CONFIG="no"
+ ;;
+esac
+fi
+KSBA_CONFIG=$ac_cv_path_KSBA_CONFIG
+if test -n "$KSBA_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KSBA_CONFIG" >&5
+$as_echo "$KSBA_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ tmp="$NEED_KSBA_API:$NEED_KSBA_VERSION"
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_ksba_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_ksba_api=0
+ min_ksba_version="$tmp"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KSBA - version >= $min_ksba_version" >&5
+$as_echo_n "checking for KSBA - version >= $min_ksba_version... " >&6; }
+ ok=no
+ if test "$KSBA_CONFIG" != "no" ; then
+ req_major=`echo $min_ksba_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+ req_minor=`echo $min_ksba_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+ req_micro=`echo $min_ksba_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+ ksba_config_version=`$KSBA_CONFIG $ksba_config_args --version`
+ major=`echo $ksba_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
+ minor=`echo $ksba_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
+ micro=`echo $ksba_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+ if test "$major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$major" -eq "$req_major"; then
+ if test "$minor" -gt "$req_minor"; then
+ ok=yes
+ else
+ if test "$minor" -eq "$req_minor"; then
+ if test "$micro" -ge "$req_micro"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($ksba_config_version)" >&5
+$as_echo "yes ($ksba_config_version)" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ if test $ok = yes; then
+ # Even if we have a recent libksba, we should check that the
+ # API is compatible.
+ if test "$req_ksba_api" -gt 0 ; then
+ tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking KSBA API version" >&5
+$as_echo_n "checking KSBA API version... " >&6; }
+ if test "$req_ksba_api" -eq "$tmp" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
+$as_echo "okay" >&6; }
+ else
+ ok=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_ksba_api got=$tmp." >&5
+$as_echo "does not match. want=$req_ksba_api got=$tmp." >&6; }
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags`
+ KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs`
+ have_ksba=yes
+ libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none`
+ if test x"$libksba_config_host" != xnone ; then
+ if test x"$libksba_config_host" != x"$host" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** The config script $LIBKSBA_CONFIG was
+*** built for $libksba_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libksba-prefix
+*** to specify a matching config script.
+***" >&5
+$as_echo "$as_me: WARNING:
+***
+*** The config script $LIBKSBA_CONFIG was
+*** built for $libksba_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libksba-prefix
+*** to specify a matching config script.
+***" >&2;}
+ fi
+ fi
+ else
+ KSBA_CFLAGS=""
+ KSBA_LIBS=""
+ have_ksba=no
+ fi
+
+
+
+
+
+#
+# libusb allows us to use the integrated CCID smartcard reader driver.
+#
+# FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs.
+if test "$use_ccid_driver" = yes ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_bulk_write in -lusb" >&5
+$as_echo_n "checking for usb_bulk_write in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_bulk_write+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_bulk_write ();
+int
+main ()
+{
+return usb_bulk_write ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_usb_usb_bulk_write=yes
+else
+ ac_cv_lib_usb_usb_bulk_write=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_bulk_write" >&5
+$as_echo "$ac_cv_lib_usb_usb_bulk_write" >&6; }
+if test "x$ac_cv_lib_usb_usb_bulk_write" = xyes; then :
+ LIBUSB_LIBS="$LIBUSB_LIBS -lusb"
+
+$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
+
+ have_libusb=yes
+
+fi
+
+ for ac_func in usb_create_match
+do :
+ ac_fn_c_check_func "$LINENO" "usb_create_match" "ac_cv_func_usb_create_match"
+if test "x$ac_cv_func_usb_create_match" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_USB_CREATE_MATCH 1
+_ACEOF
+
+fi
+done
+
+fi
+
+
+#
+# Check wether it is necessary to link against libdl.
+# (For example to load libpcsclite)
+#
+gnupg_dlopen_save_libs="$LIBS"
+LIBS=""
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' c dl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_dlopen+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+ ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+DL_LIBS=$LIBS
+
+LIBS="$gnupg_dlopen_save_libs"
+
++
++# Checks for g10
++
++# Check whether --enable-sqlite was given.
++if test "${enable_sqlite+set}" = set; then :
++ enableval=$enable_sqlite; try_sqlite=$enableval
++else
++ try_sqlite=yes
++fi
++
++
++if test x"$use_tofu" = xyes ; then
++ if test x"$try_sqlite" = xyes ; then
++
++
++
++
++
++
++
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++ fi
++else
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
++
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ PKG_CONFIG=""
++ fi
++fi
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE3" >&5
++$as_echo_n "checking for SQLITE3... " >&6; }
++
++if test -n "$SQLITE3_CFLAGS"; then
++ pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$NEED_SQLITE_VERSION\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "sqlite3 >= $NEED_SQLITE_VERSION") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_SQLITE3_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $NEED_SQLITE_VERSION" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$SQLITE3_LIBS"; then
++ pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$NEED_SQLITE_VERSION\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "sqlite3 >= $NEED_SQLITE_VERSION") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_SQLITE3_LIBS=`$PKG_CONFIG --libs "sqlite3 >= $NEED_SQLITE_VERSION" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sqlite3 >= $NEED_SQLITE_VERSION" 2>&1`
++ else
++ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sqlite3 >= $NEED_SQLITE_VERSION" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$SQLITE3_PKG_ERRORS" >&5
++
++ have_sqlite=no
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ have_sqlite=no
++else
++ SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS
++ SQLITE3_LIBS=$pkg_cv_SQLITE3_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ have_sqlite=yes
++fi
++ fi
++ if test "$have_sqlite" = "yes"; then
++ :
++
++
++ else
++ use_tofu=no
++ tmp=$(echo "$SQLITE3_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
++***
++*** Building without SQLite support - TOFU disabled
++***
++*** $tmp" >&5
++$as_echo "$as_me: WARNING:
++***
++*** Building without SQLite support - TOFU disabled
++***
++*** $tmp" >&2;}
++ fi
++fi
++
++ if test "$have_sqlite" = "yes"; then
++ SQLITE3_TRUE=
++ SQLITE3_FALSE='#'
++else
++ SQLITE3_TRUE='#'
++ SQLITE3_FALSE=
++fi
++
++
++if test x"$use_tofu" = xyes ; then
++
++$as_echo "#define USE_TOFU 1" >>confdefs.h
++
++fi
++
++
+# Checks for g13
+
+# Extract the first word of "encfs", so it can be a program name with args.
+set dummy encfs; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ENCFS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ENCFS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ENCFS="$ENCFS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ENCFS="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_ENCFS" && ac_cv_path_ENCFS="/usr/bin/encfs"
+ ;;
+esac
+fi
+ENCFS=$ac_cv_path_ENCFS
+if test -n "$ENCFS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENCFS" >&5
+$as_echo "$ENCFS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define ENCFS "${ENCFS}"
+_ACEOF
+
+
+# Extract the first word of "fusermount", so it can be a program name with args.
+set dummy fusermount; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FUSERMOUNT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $FUSERMOUNT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_FUSERMOUNT="$FUSERMOUNT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_FUSERMOUNT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_FUSERMOUNT" && ac_cv_path_FUSERMOUNT="/usr/bin/fusermount"
+ ;;
+esac
+fi
+FUSERMOUNT=$ac_cv_path_FUSERMOUNT
+if test -n "$FUSERMOUNT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FUSERMOUNT" >&5
+$as_echo "$FUSERMOUNT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define FUSERMOUNT "${FUSERMOUNT}"
+_ACEOF
+
+
+
+# Checks for dirmngr
+
+
+#
+# Checks for symcryptrun:
+#
+
+# libutil has openpty() and login_tty().
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+$as_echo_n "checking for openpty in -lutil... " >&6; }
+if ${ac_cv_lib_util_openpty+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lutil $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char openpty ();
+int
+main ()
+{
+return openpty ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_util_openpty=yes
+else
+ ac_cv_lib_util_openpty=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
+$as_echo "$ac_cv_lib_util_openpty" >&6; }
+if test "x$ac_cv_lib_util_openpty" = xyes; then :
+ LIBUTIL_LIBS="$LIBUTIL_LIBS -lutil"
+
+$as_echo "#define HAVE_LIBUTIL 1" >>confdefs.h
+
+
+fi
+
+
+
+# shred is used to clean temporary plain text files.
+# Extract the first word of "shred", so it can be a program name with args.
+set dummy shred; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SHRED+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $SHRED in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_SHRED="$SHRED" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_SHRED="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_SHRED" && ac_cv_path_SHRED="/usr/bin/shred"
+ ;;
+esac
+fi
+SHRED=$ac_cv_path_SHRED
+if test -n "$SHRED"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHRED" >&5
+$as_echo "$SHRED" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SHRED "${SHRED}"
+_ACEOF
+
+
+
+#
+# Check whether the nPth library is available
+#
+
+# Check whether --with-npth-prefix was given.
+if test "${with_npth_prefix+set}" = set; then :
+ withval=$with_npth_prefix; npth_config_prefix="$withval"
+else
+ npth_config_prefix=""
+fi
+
+ if test "x$npth_config_prefix" != x ; then
+ NPTH_CONFIG="$npth_config_prefix/bin/npth-config"
+ fi
+ # Extract the first word of "npth-config", so it can be a program name with args.
+set dummy npth-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_NPTH_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $NPTH_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_NPTH_CONFIG="$NPTH_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_NPTH_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_NPTH_CONFIG" && ac_cv_path_NPTH_CONFIG="no"
+ ;;
+esac
+fi
+NPTH_CONFIG=$ac_cv_path_NPTH_CONFIG
+if test -n "$NPTH_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NPTH_CONFIG" >&5
+$as_echo "$NPTH_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+ if test "$NPTH_CONFIG" != "no" ; then
+ npth_version=`$NPTH_CONFIG --version`
+ fi
+ npth_version_major=`echo $npth_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
+ npth_version_minor=`echo $npth_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
+
+ tmp="$NEED_NPTH_API:$NEED_NPTH_VERSION"
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_npth_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_npth_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_npth_api=1
+ min_npth_version="$tmp"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NPTH - version >= $min_npth_version" >&5
+$as_echo_n "checking for NPTH - version >= $min_npth_version... " >&6; }
+ ok=no
+ if test "$NPTH_CONFIG" != "no" ; then
+ req_major=`echo $min_npth_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)/\1/'`
+ req_minor=`echo $min_npth_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)/\2/'`
+ if test "$npth_version_major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$npth_version_major" -eq "$req_major"; then
+ if test "$npth_version_minor" -gt "$req_minor"; then
+ ok=yes
+ else
+ if test "$npth_version_minor" -eq "$req_minor"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($npth_version)" >&5
+$as_echo "yes ($npth_version)" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ if test $ok = yes; then
+ # If we have a recent NPTH, we should also check that the
+ # API is compatible.
+ if test "$req_npth_api" -gt 0 ; then
+ tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking NPTH API version" >&5
+$as_echo_n "checking NPTH API version... " >&6; }
+ if test "$req_npth_api" -eq "$tmp" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
+$as_echo "okay" >&6; }
+ else
+ ok=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_npth_api got=$tmp" >&5
+$as_echo "does not match. want=$req_npth_api got=$tmp" >&6; }
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ NPTH_CFLAGS=`$NPTH_CONFIG --cflags`
+ NPTH_LIBS=`$NPTH_CONFIG --libs`
+ have_npth=yes
+ npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none`
+ if test x"$npth_config_host" != xnone ; then
+ if test x"$npth_config_host" != x"$host" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** The config script $NPTH_CONFIG was
+*** built for $npth_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-npth-prefix
+*** to specify a matching config script.
+***" >&5
+$as_echo "$as_me: WARNING:
+***
+*** The config script $NPTH_CONFIG was
+*** built for $npth_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-npth-prefix
+*** to specify a matching config script.
+***" >&2;}
+ fi
+ fi
+ else
+ NPTH_CFLAGS=""
+ NPTH_LIBS=""
+ have_npth=no
+ fi
+
+
+
+if test "$have_npth" = "yes"; then
+
+$as_echo "#define HAVE_NPTH 1" >>confdefs.h
+
+
+$as_echo "#define USE_NPTH 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** To support concurrent access for example in gpg-agent and the SCdaemon
+*** we need the support of the New Portable Threads Library.
+***" >&5
+$as_echo "$as_me: WARNING:
+***
+*** To support concurrent access for example in gpg-agent and the SCdaemon
+*** we need the support of the New Portable Threads Library.
+***" >&2;}
+fi
+
+
+#
+# NTBTLS is our TLS library. If it is not available fallback to
+# GNUTLS.
+#
+# Check whether --enable-ntbtls was given.
+if test "${enable_ntbtls+set}" = set; then :
+ enableval=$enable_ntbtls; try_ntbtls=$enableval
+else
+ try_ntbtls=yes
+fi
+
+if test x"$try_ntbtls" = xyes ; then
+
+
+# Check whether --with-ntbtls-prefix was given.
+if test "${with_ntbtls_prefix+set}" = set; then :
+ withval=$with_ntbtls_prefix; ntbtls_config_prefix="$withval"
+else
+ ntbtls_config_prefix=""
+fi
+
+ if test x"${NTBTLS_CONFIG}" = x ; then
+ if test x"${ntbtls_config_prefix}" != x ; then
+ NTBTLS_CONFIG="${ntbtls_config_prefix}/bin/ntbtls-config"
+ else
+ case "${SYSROOT}" in
+ /*)
+ if test -x "${SYSROOT}/bin/ntbtls-config" ; then
+ NTBTLS_CONFIG="${SYSROOT}/bin/ntbtls-config"
+ fi
+ ;;
+ '')
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
+$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
+ ;;
+ esac
+ fi
+ fi
+
+ # Extract the first word of "ntbtls-config", so it can be a program name with args.
+set dummy ntbtls-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_NTBTLS_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $NTBTLS_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_NTBTLS_CONFIG="$NTBTLS_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_NTBTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_NTBTLS_CONFIG" && ac_cv_path_NTBTLS_CONFIG="no"
+ ;;
+esac
+fi
+NTBTLS_CONFIG=$ac_cv_path_NTBTLS_CONFIG
+if test -n "$NTBTLS_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NTBTLS_CONFIG" >&5
+$as_echo "$NTBTLS_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ tmp="$NEED_NTBTLS_API:$NEED_NTBTLS_VERSION"
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_ntbtls_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_ntbtls_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_ntbtls_api=0
+ min_ntbtls_version="$tmp"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NTBTLS - version >= $min_ntbtls_version" >&5
+$as_echo_n "checking for NTBTLS - version >= $min_ntbtls_version... " >&6; }
+ ok=no
+ if test "$NTBTLS_CONFIG" != "no" ; then
+ req_major=`echo $min_ntbtls_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+ req_minor=`echo $min_ntbtls_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+ req_micro=`echo $min_ntbtls_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+ ntbtls_config_version=`$NTBTLS_CONFIG --version`
+ major=`echo $ntbtls_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
+ minor=`echo $ntbtls_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
+ micro=`echo $ntbtls_config_version | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+ if test "$major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$major" -eq "$req_major"; then
+ if test "$minor" -gt "$req_minor"; then
+ ok=yes
+ else
+ if test "$minor" -eq "$req_minor"; then
+ if test "$micro" -ge "$req_micro"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($ntbtls_config_version)" >&5
+$as_echo "yes ($ntbtls_config_version)" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ if test $ok = yes; then
+ # If we have a recent ntbtls, we should also check that the
+ # API is compatible
+ if test "$req_ntbtls_api" -gt 0 ; then
+ tmp=`$NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking NTBTLS API version" >&5
+$as_echo_n "checking NTBTLS API version... " >&6; }
+ if test "$req_ntbtls_api" -eq "$tmp" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
+$as_echo "okay" >&6; }
+ else
+ ok=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_ntbtls_api got=$tmp" >&5
+$as_echo "does not match. want=$req_ntbtls_api got=$tmp" >&6; }
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ NTBTLS_CFLAGS=`$NTBTLS_CONFIG --cflags`
+ NTBTLS_LIBS=`$NTBTLS_CONFIG --libs`
+ have_ntbtls=yes
+ ntbtls_config_host=`$NTBTLS_CONFIG --host 2>/dev/null || echo none`
+ if test x"$ntbtls_config_host" != xnone ; then
+ if test x"$ntbtls_config_host" != x"$host" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** The config script $NTBTLS_CONFIG was
+*** built for $ntbtls_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-ntbtls-prefix
+*** to specify a matching config script or use \$SYSROOT.
+***" >&5
+$as_echo "$as_me: WARNING:
+***
+*** The config script $NTBTLS_CONFIG was
+*** built for $ntbtls_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-ntbtls-prefix
+*** to specify a matching config script or use \$SYSROOT.
+***" >&2;}
+ gpg_config_script_warn="$gpg_config_script_warn ntbtls"
+ fi
+ fi
+ else
+ NTBTLS_CFLAGS=""
+ NTBTLS_LIBS=""
+ have_ntbtls=no
+ fi
+
+
+
+fi
+if test "$have_ntbtls" = yes ; then
+ use_tls_library=ntbtls
+
+$as_echo "#define HTTP_USE_NTBTLS 1" >>confdefs.h
+
+else
+ # Check whether --enable-gnutls was given.
+if test "${enable_gnutls+set}" = set; then :
+ enableval=$enable_gnutls; try_gnutls=$enableval
+else
+ try_gnutls=yes
+fi
+
+ if test x"$try_gnutls" = xyes ; then
+
-
-
-
-
-
-
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
- IFS=$as_save_IFS
-
- ;;
- esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- fi
- if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
- IFS=$as_save_IFS
-
- ;;
- esac
- fi
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
- $as_echo "$ac_pt_PKG_CONFIG" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
- else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
- fi
-
- fi
- if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
- $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
- fi
-
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNUTLS" >&5
+$as_echo_n "checking for LIBGNUTLS... " >&6; }
+
+if test -n "$LIBGNUTLS_CFLAGS"; then
+ pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= \$NEED_GNUTLS_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnutls >= $NEED_GNUTLS_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= $NEED_GNUTLS_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBGNUTLS_LIBS"; then
+ pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= \$NEED_GNUTLS_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnutls >= $NEED_GNUTLS_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= $NEED_GNUTLS_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= $NEED_GNUTLS_VERSION" 2>&1`
+ else
+ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= $NEED_GNUTLS_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBGNUTLS_PKG_ERRORS" >&5
+
+ have_gnutls=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_gnutls=no
+else
+ LIBGNUTLS_CFLAGS=$pkg_cv_LIBGNUTLS_CFLAGS
+ LIBGNUTLS_LIBS=$pkg_cv_LIBGNUTLS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_gnutls=yes
+fi
+ fi
+ if test "$have_gnutls" = "yes"; then
+
+
+ use_tls_library=gnutls
+
+$as_echo "#define HTTP_USE_GNUTLS 1" >>confdefs.h
+
+ else
+ tmp=$(echo "$LIBGNUTLS_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** Building without NTBTLS and GNUTLS - no TLS access to keyservers.
+***
+*** $tmp" >&5
+$as_echo "$as_me: WARNING:
+***
+*** Building without NTBTLS and GNUTLS - no TLS access to keyservers.
+***
+*** $tmp" >&2;}
+ fi
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for networking options" >&5
+$as_echo "$as_me: checking for networking options" >&6;}
+
+#
+# Must check for network library requirements before doing link tests
+# for ldap, for example. If ldap libs are static (or dynamic and without
+# ELF runtime link paths), then link will fail and LDAP support won't
+# be detected.
+#
+ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = xyes; then :
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_nsl_gethostbyname=yes
+else
+ ac_cv_lib_nsl_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
+ NETLIBS="-lnsl $NETLIBS"
+fi
+
+fi
+
+ac_fn_c_check_func "$LINENO" "setsockopt" "ac_cv_func_setsockopt"
+if test "x$ac_cv_func_setsockopt" = xyes; then :
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lsocket" >&5
+$as_echo_n "checking for setsockopt in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_setsockopt+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char setsockopt ();
+int
+main ()
+{
+return setsockopt ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_socket_setsockopt=yes
+else
+ ac_cv_lib_socket_setsockopt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_setsockopt" >&5
+$as_echo "$ac_cv_lib_socket_setsockopt" >&6; }
+if test "x$ac_cv_lib_socket_setsockopt" = xyes; then :
+ NETLIBS="-lsocket $NETLIBS"
+fi
+
+fi
+
+
+
+#
+# Check for ADNS.
+#
+_cppflags="${CPPFLAGS}"
+_ldflags="${LDFLAGS}"
+
+# Check whether --with-adns was given.
+if test "${with_adns+set}" = set; then :
+ withval=$with_adns; if test -d "$withval"; then
+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
+ LDFLAGS="${LDFLAGS} -L$withval/lib"
+ fi
+fi
+
+if test "$with_adns" != "no"; then
+ for ac_header in adns.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "adns.h" "ac_cv_header_adns_h" "$ac_includes_default"
+if test "x$ac_cv_header_adns_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_ADNS_H 1
+_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for adns_free in -ladns" >&5
- $as_echo_n "checking for adns_free in -ladns... " >&6; }
- if ${ac_cv_lib_adns_adns_free+:} false; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for adns_init_strcfg in -ladns" >&5
++$as_echo_n "checking for adns_init_strcfg in -ladns... " >&6; }
++if ${ac_cv_lib_adns_adns_init_strcfg+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ladns $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
- char adns_free ();
++char adns_init_strcfg ();
+int
+main ()
+{
- return adns_free ();
++return adns_init_strcfg ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_adns_adns_free=yes
++ ac_cv_lib_adns_adns_init_strcfg=yes
+else
- ac_cv_lib_adns_adns_free=no
++ ac_cv_lib_adns_adns_init_strcfg=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_adns_adns_free" >&5
- $as_echo "$ac_cv_lib_adns_adns_free" >&6; }
- if test "x$ac_cv_lib_adns_adns_free" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_adns_adns_init_strcfg" >&5
++$as_echo "$ac_cv_lib_adns_adns_init_strcfg" >&6; }
++if test "x$ac_cv_lib_adns_adns_init_strcfg" = xyes; then :
+ have_adns=yes
- else
- CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}
+fi
+
- else
- CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}
+fi
+
+done
+
++ for ac_func in adns_free
++do :
++ ac_fn_c_check_func "$LINENO" "adns_free" "ac_cv_func_adns_free"
++if test "x$ac_cv_func_adns_free" = xyes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_ADNS_FREE 1
++_ACEOF
++
++fi
++done
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if adns supports adns_if_tormode" >&5
++$as_echo_n "checking if adns supports adns_if_tormode... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++ #include <adns.h>
++ adns_initflags flags = adns_if_tormode;
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ adns_if_tormode=yes
++else
++ adns_if_tormode=no
+fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $adns_if_tormode" >&5
++$as_echo "$adns_if_tormode" >&6; }
++ if test x"$adns_if_tormode" = xyes; then
++
++$as_echo "#define HAVE_ADNS_IF_TORMODE 1" >>confdefs.h
++
++ if test "$show_tor_support" != "no"; then
++ show_tor_support=yes
++ fi
++ fi
++fi
++CPPFLAGS=${_cppflags}
++LDFLAGS=${_ldflags}
+if test "$have_adns" = "yes"; then
+ ADNSLIBS="-ladns"
+fi
+
+
+#
+# Now try for the resolver functions so we can use DNS for SRV, PA and CERT.
+#
+# Check whether --enable-dns-srv was given.
+if test "${enable_dns_srv+set}" = set; then :
+ enableval=$enable_dns_srv; use_dns_srv=$enableval
+else
+ use_dns_srv=yes
+fi
+
+
+# Check whether --enable-dns-cert was given.
+if test "${enable_dns_cert+set}" = set; then :
+ enableval=$enable_dns_cert; use_dns_cert=$enableval
+else
+ use_dns_cert=yes
+fi
+
+
+if test x"$use_dns_srv" = xyes || test x"$use_dns_cert" = xyes; then
+ _dns_save_libs=$LIBS
+ LIBS=""
- # the double underscore thing is a glibc-ism?
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_query" >&5
++
++ if test x"$have_adns" = xyes ; then
++ # We prefer ADNS.
++ DNSLIBS="$ADNSLIBS"
++
++$as_echo "#define USE_ADNS 1" >>confdefs.h
++
++
++ if test x"$use_dns_srv" = xyes ; then
++ $as_echo "#define USE_DNS_SRV 1" >>confdefs.h
++
++ fi
++
++ if test x"$use_dns_cert" = xyes ; then
++
++$as_echo "#define USE_DNS_CERT 1" >>confdefs.h
++
++ fi
++ else
++ # With no ADNS find the system resolver.
++
++ # the double underscore thing is a glibc-ism?
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_query" >&5
+$as_echo_n "checking for library containing res_query... " >&6; }
+if ${ac_cv_search_res_query+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_query ();
+int
+main ()
+{
+return res_query ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_res_query=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_res_query+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_res_query+:} false; then :
+
+else
+ ac_cv_search_res_query=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_query" >&5
+$as_echo "$ac_cv_search_res_query" >&6; }
+ac_res=$ac_cv_search_res_query
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __res_query" >&5
+$as_echo_n "checking for library containing __res_query... " >&6; }
+if ${ac_cv_search___res_query+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_query ();
+int
+main ()
+{
+return __res_query ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search___res_query=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search___res_query+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search___res_query+:} false; then :
+
+else
+ ac_cv_search___res_query=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___res_query" >&5
+$as_echo "$ac_cv_search___res_query" >&6; }
+ac_res=$ac_cv_search___res_query
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+ have_resolver=no
+fi
+
+fi
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dn_expand" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dn_expand" >&5
+$as_echo_n "checking for library containing dn_expand... " >&6; }
+if ${ac_cv_search_dn_expand+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_expand ();
+int
+main ()
+{
+return dn_expand ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_dn_expand=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_dn_expand+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_dn_expand+:} false; then :
+
+else
+ ac_cv_search_dn_expand=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dn_expand" >&5
+$as_echo "$ac_cv_search_dn_expand" >&6; }
+ac_res=$ac_cv_search_dn_expand
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __dn_expand" >&5
+$as_echo_n "checking for library containing __dn_expand... " >&6; }
+if ${ac_cv_search___dn_expand+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dn_expand ();
+int
+main ()
+{
+return __dn_expand ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search___dn_expand=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search___dn_expand+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search___dn_expand+:} false; then :
+
+else
+ ac_cv_search___dn_expand=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___dn_expand" >&5
+$as_echo "$ac_cv_search___dn_expand" >&6; }
+ac_res=$ac_cv_search___dn_expand
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+ have_resolver=no
+fi
+
+fi
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dn_skipname" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dn_skipname" >&5
+$as_echo_n "checking for library containing dn_skipname... " >&6; }
+if ${ac_cv_search_dn_skipname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_skipname ();
+int
+main ()
+{
+return dn_skipname ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_dn_skipname=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_dn_skipname+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_dn_skipname+:} false; then :
+
+else
+ ac_cv_search_dn_skipname=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dn_skipname" >&5
+$as_echo "$ac_cv_search_dn_skipname" >&6; }
+ac_res=$ac_cv_search_dn_skipname
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __dn_skipname" >&5
+$as_echo_n "checking for library containing __dn_skipname... " >&6; }
+if ${ac_cv_search___dn_skipname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dn_skipname ();
+int
+main ()
+{
+return __dn_skipname ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search___dn_skipname=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search___dn_skipname+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search___dn_skipname+:} false; then :
+
+else
+ ac_cv_search___dn_skipname=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___dn_skipname" >&5
+$as_echo "$ac_cv_search___dn_skipname" >&6; }
+ac_res=$ac_cv_search___dn_skipname
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+ have_resolver=no
+fi
+
+fi
+
+
- if test x"$have_resolver" != xno ; then
++ if test x"$have_resolver" != xno ; then
+
- # Make sure that the BIND 4 resolver interface is workable before
- # enabling any code that calls it. At some point I'll rewrite the
- # code to use the BIND 8 resolver API.
- # We might also want to use adns instead. Problem with ADNS is that
- # it does not support v6.
++ # Make sure that the BIND 4 resolver interface is workable before
++ # enabling any code that calls it. At some point I'll rewrite the
++ # code to use the BIND 8 resolver API.
++ # We might also want to use adns instead. Problem with ADNS is that
++ # it does not support v6.
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the resolver is usable" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the resolver is usable" >&5
+$as_echo_n "checking whether the resolver is usable... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+int
+main ()
+{
+unsigned char answer[PACKETSZ];
+ res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
+ dn_skipname(0,0);
+ dn_expand(0,0,0,0,0);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ have_resolver=yes
+else
+ have_resolver=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_resolver" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_resolver" >&5
+$as_echo "$have_resolver" >&6; }
+
- # This is Apple-specific and somewhat bizarre as they changed the
- # define in bind 8 for some reason.
++ # This is Apple-specific and somewhat bizarre as they changed the
++ # define in bind 8 for some reason.
+
- if test x"$have_resolver" != xyes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether I can make the resolver usable with BIND_8_COMPAT" >&5
++ if test x"$have_resolver" != xyes ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether I can make the resolver usable with BIND_8_COMPAT" >&5
+$as_echo_n "checking whether I can make the resolver usable with BIND_8_COMPAT... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define BIND_8_COMPAT
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+int
+main ()
+{
+unsigned char answer[PACKETSZ];
+ res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
+ dn_skipname(0,0); dn_expand(0,0,0,0,0);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ have_resolver=yes ; need_compat=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_resolver" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_resolver" >&5
+$as_echo "$have_resolver" >&6; }
++ fi
+ fi
- fi
+
- if test x"$have_resolver" = xyes ; then
- DNSLIBS=$LIBS
++ if test x"$have_resolver" = xyes ; then
++ DNSLIBS=$LIBS
+
- if test x"$use_dns_srv" = xyes ; then
++ if test x"$use_dns_srv" = xyes ; then
+
+$as_echo "#define USE_DNS_SRV 1" >>confdefs.h
+
- fi
++ fi
+
- if test x"$use_dns_cert" = xyes ; then
++ if test x"$use_dns_cert" = xyes ; then
+
+$as_echo "#define USE_DNS_CERT 1" >>confdefs.h
+
- fi
++ fi
+
- if test x"$need_compat" = xyes ; then
++ if test x"$need_compat" = xyes ; then
+
+$as_echo "#define BIND_8_COMPAT 1" >>confdefs.h
+
- fi
- else
- # If we have no resolver library but ADNS (e.g. under W32) enable the
- # code parts which can be used with ADNS.
- if test x"$have_adns" = xyes ; then
- DNSLIBS="$ADNSLIBS"
-
- $as_echo "#define USE_ADNS 1" >>confdefs.h
-
-
- if test x"$use_dns_srv" = xyes ; then
- $as_echo "#define USE_DNS_SRV 1" >>confdefs.h
-
- fi
-
- if test x"$use_dns_cert" = xyes ; then
-
- $as_echo "#define USE_DNS_CERT 1" >>confdefs.h
-
- fi
- else
- use_dns_srv=no
- use_dns_cert=no
- fi
++ fi
++ else
++ use_dns_srv=no
++ use_dns_cert=no
++ fi
+ fi
+
+ LIBS=$_dns_save_libs
+fi
+
+
+
+ if test x"$use_dns_srv" = xyes; then
+ USE_DNS_SRV_TRUE=
+ USE_DNS_SRV_FALSE='#'
+else
+ USE_DNS_SRV_TRUE='#'
+ USE_DNS_SRV_FALSE=
+fi
+
+
+
+#
+# Check for LDAP
+#
+# Note that running the check changes the variable
+# gnupg_have_ldap from "n/a" to "no" or "yes".
+
+# Check whether --enable-ldap was given.
+if test "${enable_ldap+set}" = set; then :
+ enableval=$enable_ldap; if test "$enableval" = "no"; then gnupg_have_ldap=no; fi
+fi
+
+
+if test "$gnupg_have_ldap" != "no" ; then
+ if test "$build_dirmngr" = "yes" ; then
+
+# Try and link a LDAP test program to weed out unusable LDAP
+# libraries. -lldap [-llber [-lresolv]] is for older OpenLDAPs.
+# OpenLDAP, circa 1999, was terrible with creating weird dependencies.
+# If all else fails, the user can play guess-the-dependency by using
+# something like ./configure LDAPLIBS="-Lfoo -lbar"
+gnupg_have_ldap=no
+
+# Check whether --with-ldap was given.
+if test "${with_ldap+set}" = set; then :
+ withval=$with_ldap; _ldap_with=$withval
+fi
+
+
+if test x$_ldap_with != xno ; then
+
+ if test -d "$withval" ; then
+ LDAP_CPPFLAGS="-I$withval/include"
+ LDAP_LDFLAGS="-L$withval/lib"
+ fi
+
+ _ldap_save_cppflags=$CPPFLAGS
+ CPPFLAGS="${LDAP_CPPFLAGS} ${CPPFLAGS}"
+ _ldap_save_ldflags=$LDFLAGS
+ LDFLAGS="${LDAP_LDFLAGS} ${LDFLAGS}"
+
+ for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv" "-lwldap32"; do
+ _ldap_save_libs=$LIBS
+ LIBS="$MY_LDAPLIBS $NETLIBS $LIBS"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether LDAP via \"$MY_LDAPLIBS\" is present and sane" >&5
+$as_echo_n "checking whether LDAP via \"$MY_LDAPLIBS\" is present and sane... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <winldap.h>
+#else
+#include <ldap.h>
+#endif
+
+int
+main ()
+{
+ldap_open("foobar",1234);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gnupg_cv_func_ldap_init=yes
+else
+ gnupg_cv_func_ldap_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_func_ldap_init" >&5
+$as_echo "$gnupg_cv_func_ldap_init" >&6; }
+
+ if test $gnupg_cv_func_ldap_init = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether I can make LDAP be sane with lber.h" >&5
+$as_echo_n "checking whether I can make LDAP be sane with lber.h... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <lber.h>
+#include <ldap.h>
+int
+main ()
+{
+ldap_open("foobar",1234);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gnupg_cv_func_ldaplber_init=yes
+else
+ gnupg_cv_func_ldaplber_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_func_ldaplber_init" >&5
+$as_echo "$gnupg_cv_func_ldaplber_init" >&6; }
+ fi
+
+ if test "$gnupg_cv_func_ldaplber_init" = yes ; then
+
+$as_echo "#define NEED_LBER_H 1" >>confdefs.h
+
+ fi
+
+ if test "$gnupg_cv_func_ldap_init" = yes || \
+ test "$gnupg_cv_func_ldaplber_init" = yes ; then
+ LDAPLIBS="$LDAP_LDFLAGS $MY_LDAPLIBS"
+ GPGKEYS_LDAP="gpg2keys_ldap$EXEEXT"
+ gnupg_have_ldap=yes
+
+ for ac_func in ldap_get_option ldap_set_option
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ # The extra test for ldap_start_tls_sA is for W32 because
+ # that is the actual function in the library.
+ for ac_func in ldap_start_tls_s ldap_start_tls_sA
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+ if test "$ac_cv_func_ldap_get_option" != yes ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether LDAP supports ld_errno" >&5
+$as_echo_n "checking whether LDAP supports ld_errno... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ldap.h>
+int
+main ()
+{
+LDAP *ldap; ldap->ld_errno;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gnupg_cv_func_ldap_ld_errno=yes
+else
+ gnupg_cv_func_ldap_ld_errno=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_func_ldap_ld_errno" >&5
+$as_echo "$gnupg_cv_func_ldap_ld_errno" >&6; }
+
+ if test "$gnupg_cv_func_ldap_ld_errno" = yes ; then
+
+$as_echo "#define HAVE_LDAP_LD_ERRNO 1" >>confdefs.h
+
+ fi
+ fi
+ fi
+
+ LIBS=$_ldap_save_libs
+
+ if test "$GPGKEYS_LDAP" != "" ; then break; fi
+ done
+
+
+
+
+
+ CPPFLAGS=$_ldap_save_cppflags
+ LDFLAGS=$_ldap_save_ldflags
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_free in -llber" >&5
+$as_echo_n "checking for ber_free in -llber... " >&6; }
+if ${ac_cv_lib_lber_ber_free+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llber $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ber_free ();
+int
+main ()
+{
+return ber_free ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_lber_ber_free=yes
+else
+ ac_cv_lib_lber_ber_free=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_free" >&5
+$as_echo "$ac_cv_lib_lber_ber_free" >&6; }
+if test "x$ac_cv_lib_lber_ber_free" = xyes; then :
+ LBER_LIBS="$LBER_LIBS -llber"
+
+$as_echo "#define HAVE_LBER 1" >>confdefs.h
+
+ have_lber=yes
+
+fi
+
+ fi
+fi
+
+if test "$gnupg_have_ldap" = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** Building without LDAP support.
+*** No CRL access or X.509 certificate search available.
+***" >&5
+$as_echo "$as_me: WARNING:
+***
+*** Building without LDAP support.
+*** No CRL access or X.509 certificate search available.
+***" >&2;}
+fi
+
+ if test "$gnupg_have_ldap" = yes; then
+ USE_LDAP_TRUE=
+ USE_LDAP_FALSE='#'
+else
+ USE_LDAP_TRUE='#'
+ USE_LDAP_FALSE=
+fi
+
+if test "$gnupg_have_ldap" = yes ; then
+
+$as_echo "#define USE_LDAP 1" >>confdefs.h
+
+else
+ use_ldapwrapper=no
+fi
+
+if test "$use_ldapwrapper" = yes; then
+
+$as_echo "#define USE_LDAPWRAPPER 1" >>confdefs.h
+
+fi
+ if test "$use_ldapwrapper" = yes; then
+ USE_LDAPWRAPPER_TRUE=
+ USE_LDAPWRAPPER_FALSE='#'
+else
+ USE_LDAPWRAPPER_TRUE='#'
+ USE_LDAPWRAPPER_FALSE=
+fi
+
+
+
+
+
+#
+# Check for sendmail
+#
+# This isn't necessarily sendmail itself, but anything that gives a
+# sendmail-ish interface to the outside world. That includes Exim,
+# Postfix, etc. Basically, anything that can handle "sendmail -t".
+
+# Check whether --with-mailprog was given.
+if test "${with_mailprog+set}" = set; then :
+ withval=$with_mailprog;
+else
+ with_mailprog=yes
+fi
+
+if test x"$with_mailprog" = xyes ; then
+ # Extract the first word of "sendmail", so it can be a program name with args.
+set dummy sendmail; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SENDMAIL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $SENDMAIL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/sbin:/usr/libexec:/usr/lib"
+for as_dir in $as_dummy
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+SENDMAIL=$ac_cv_path_SENDMAIL
+if test -n "$SENDMAIL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SENDMAIL" >&5
+$as_echo "$SENDMAIL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+elif test x"$with_mailprog" != xno ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a mail transport program" >&5
+$as_echo_n "checking for a mail transport program... " >&6; }
+ SENDMAIL=$with_mailprog
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_mailprog" >&5
+$as_echo "$with_mailprog" >&6; }
+fi
+
+
+#
+# Construct a printable name of the OS
+#
+case "${host}" in
+ *-mingw32ce*)
+ PRINTABLE_OS_NAME="W32CE"
+ ;;
+ *-mingw32*)
+ PRINTABLE_OS_NAME="MingW32"
+ ;;
+ *-*-cygwin*)
+ PRINTABLE_OS_NAME="Cygwin"
+ ;;
+ i?86-emx-os2 | i?86-*-os2*emx )
+ PRINTABLE_OS_NAME="OS/2"
+ ;;
+ i?86-*-msdosdjgpp*)
+ PRINTABLE_OS_NAME="MSDOS/DJGPP"
+ try_dynload=no
+ ;;
+ *-linux*)
+ PRINTABLE_OS_NAME="GNU/Linux"
+ ;;
+ *)
+ PRINTABLE_OS_NAME=`uname -s || echo "Unknown"`
+ ;;
+esac
+
+cat >>confdefs.h <<_ACEOF
+#define PRINTABLE_OS_NAME "$PRINTABLE_OS_NAME"
+_ACEOF
+
+
+
+#
+# Checking for iconv
+#
+if test "$require_iconv" = yes; then
+
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${acl_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break ;;
+ *)
+ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${acl_cv_prog_gnu_ld+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=yes ;;
+*)
+ acl_cv_prog_gnu_ld=no ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if ${acl_cv_rpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
+ wl="$acl_cv_wl"
+ acl_libext="$acl_cv_libext"
+ acl_shlibext="$acl_cv_shlibext"
+ acl_libname_spec="$acl_cv_libname_spec"
+ acl_library_names_spec="$acl_cv_library_names_spec"
+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ acl_hardcode_direct="$acl_cv_hardcode_direct"
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+ enableval=$enable_rpath; :
+else
+ enable_rpath=yes
+fi
+
+
+
+ acl_libdirstem=lib
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+
+
+
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+ withval=$with_libiconv_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ fi
+ fi
+
+fi
+
+ LIBICONV=
+ LTLIBICONV=
+ INCICONV=
+ LIBICONV_PREFIX=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='iconv '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ LIBICONV_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
+ fi
+
+
+
+
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$am_save_LIBS"
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+ returns. */
+ {
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+ if (cd_utf8_to_88591 != (iconv_t)(-1))
+ {
+ static const char input[] = "\342\202\254"; /* EURO SIGN */
+ char buf[10];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_utf8_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
+#if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ char buf[50];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_88591_to_utf8,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if ((int)res > 0)
+ return 1;
+ }
+ }
+#endif
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+ /* Try IRIX, OSF/1 names. */
+ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+ /* Try AIX names. */
+ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+ /* Try HP-UX names. */
+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+ return 1;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ am_cv_func_iconv_works=yes
+else
+ am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ LIBS="$am_save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+ case "$am_cv_func_iconv_works" in
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+ *) am_func_iconv=yes ;;
+ esac
+ else
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
+
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+ if ${am_cv_proto_iconv+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ am_cv_proto_iconv_arg1=""
+else
+ am_cv_proto_iconv_arg1="const"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
+fi
+
+ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
+ }$am_cv_proto_iconv" >&5
+$as_echo "${ac_t:-
+ }$am_cv_proto_iconv" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
+_ACEOF
+
+ fi
+
+else
+ LIBICONV=
+ LTLIBICONV=
+
+
+fi
+
+
+#
+# Check for gettext
+#
+# This is "GNU gnupg" - The project-id script from gettext
+# needs this string
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext" >&5
+$as_echo "$as_me: checking for gettext" >&6;}
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+ # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+ enableval=$enable_nls; USE_NLS=$enableval
+else
+ USE_NLS=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+ GETTEXT_MACRO_VERSION=0.17
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGFMT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case "$MSGFMT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
+ if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+ ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GMSGFMT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GMSGFMT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+ *) MSGFMT_015=$MSGFMT ;;
+ esac
+
+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+ *) GMSGFMT_015=$GMSGFMT ;;
+ esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XGETTEXT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case "$XGETTEXT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
+ if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+ ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ rm -f messages.po
+
+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+ *) XGETTEXT_015=$XGETTEXT ;;
+ esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGMERGE+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case "$MSGMERGE" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
+ if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+ ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+ ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$localedir" || localedir='${datadir}/locale'
+
+
+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+
+
+ ac_config_commands="$ac_config_commands po-directories"
+
+
+
+if test "$try_gettext" = yes; then
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <CoreFoundation/CFPreferences.h>
+int
+main ()
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_func_CFPreferencesCopyAppValue=yes
+else
+ gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyCurrent();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_func_CFLocaleCopyCurrent=yes
+else
+ gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+ fi
+ INTL_MACOSX_LIBS=
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+ fi
+
+
+
+
+
+
+ LIBINTL=
+ LTLIBINTL=
+ POSUB=
+
+ case " $gt_needs " in
+ *" need-formatstring-macros "*) gt_api_version=3 ;;
+ *" need-ngettext "*) gt_api_version=2 ;;
+ *) gt_api_version=1 ;;
+ esac
+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+
+
+ if test $gt_api_version -ge 3; then
+ gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+'
+ else
+ gt_revision_test_code=
+ fi
+ if test $gt_api_version -ge 2; then
+ gt_expression_test_code=' + * ngettext ("", "", 0)'
+ else
+ gt_expression_test_code=
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if eval \${$gt_func_gnugettext_libc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$gt_func_gnugettext_libc=yes"
+else
+ eval "$gt_func_gnugettext_libc=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$gt_func_gnugettext_libc
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+
+
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$am_save_LIBS"
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+ returns. */
+ {
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+ if (cd_utf8_to_88591 != (iconv_t)(-1))
+ {
+ static const char input[] = "\342\202\254"; /* EURO SIGN */
+ char buf[10];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_utf8_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
+#if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ char buf[50];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_88591_to_utf8,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if ((int)res > 0)
+ return 1;
+ }
+ }
+#endif
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+ /* Try IRIX, OSF/1 names. */
+ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+ /* Try AIX names. */
+ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+ /* Try HP-UX names. */
+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+ return 1;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ am_cv_func_iconv_works=yes
+else
+ am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ LIBS="$am_save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+ case "$am_cv_func_iconv_works" in
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+ *) am_func_iconv=yes ;;
+ esac
+ else
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-libintl-prefix was given.
+if test "${with_libintl_prefix+set}" = set; then :
+ withval=$with_libintl_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ fi
+ fi
+
+fi
+
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ LIBINTL_PREFIX=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='intl '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ LIBINTL_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+ done
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$gt_func_gnugettext_libintl=yes"
+else
+ eval "$gt_func_gnugettext_libintl=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"
+fi
+eval ac_res=\$$gt_func_gnugettext_libintl
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ fi
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+ && test "$PACKAGE" != gettext-runtime \
+ && test "$PACKAGE" != gettext-tools; }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ fi
+
+
+
+ if test -n "$INTL_MACOSX_LIBS"; then
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+ fi
+ fi
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+ else
+ USE_NLS=no
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+ if test "$USE_NLS" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ gt_source="external libintl"
+ else
+ gt_source="libc"
+ fi
+ else
+ gt_source="included intl directory"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
+ fi
+
+ if test "$USE_NLS" = "yes"; then
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
+
+ for element in $INCINTL; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+ fi
+
+
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+ fi
+
+ POSUB=po
+ fi
+
+
+
+ INTLLIBS="$LIBINTL"
+
+
+
+
+
+
+
+ # gettext requires some extra checks. These really should be part of
+ # the basic AM_GNU_GETTEXT macro. TODO: move other gettext-specific
+ # function checks to here.
+
+ for ac_func in strchr
+do :
+ ac_fn_c_check_func "$LINENO" "strchr" "ac_cv_func_strchr"
+if test "x$ac_cv_func_strchr" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_STRCHR 1
+_ACEOF
+
+fi
+done
+
+else
+ USE_NLS=no
+ USE_INCLUDED_LIBINTL=no
+ BUILD_INCLUDED_LIBINTL=no
+ POSUB=po
+
+
+
+
+fi
+
+# We use HAVE_LANGINFO_CODESET in a couple of places.
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if ${am_cv_langinfo_codeset+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <langinfo.h>
+int
+main ()
+{
+char* cs = nl_langinfo(CODESET); return !cs;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_langinfo_codeset=yes
+else
+ am_cv_langinfo_codeset=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
+ if test $am_cv_langinfo_codeset = yes; then
+
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+
+ fi
+
+
+# Checks required for our use of locales
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
+if ${gt_cv_val_LC_MESSAGES+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <locale.h>
+int
+main ()
+{
+return LC_MESSAGES
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_val_LC_MESSAGES=yes
+else
+ gt_cv_val_LC_MESSAGES=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_val_LC_MESSAGES" >&5
+$as_echo "$gt_cv_val_LC_MESSAGES" >&6; }
+ if test $gt_cv_val_LC_MESSAGES = yes; then
+
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+
+ fi
+
+
+
+#
+# SELinux support
+#
+if test "$selinux_support" = yes ; then
+
+$as_echo "#define ENABLE_SELINUX_HACKS 1" >>confdefs.h
+
+fi
+
+
+#
+# Checks for header files.
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for header files" >&5
+$as_echo "$as_me: checking for header files" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+for ac_header in string.h unistd.h langinfo.h termio.h locale.h getopt.h \
+ pty.h utmp.h pwd.h inttypes.h signal.h sys/select.h \
+ signal.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_time=yes
+else
+ ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
+
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+fi
+
+
+
+#
+# Checks for typedefs, structures, and compiler characteristics.
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system characteristics" >&5
+$as_echo "$as_me: checking for system characteristics" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+#ifndef __cplusplus
+ /* Ultrix mips cc rejects this sort of thing. */
+ typedef int charset[2];
+ const charset cs = { 0, 0 };
+ /* SunOS 4.1.1 cc rejects this. */
+ char const *const *pcpcc;
+ char **ppc;
+ /* NEC SVR4.0.2 mips cc rejects this. */
+ struct point {int x, y;};
+ static struct point const zero = {0,0};
+ /* AIX XL C 1.02.0.0 rejects this.
+ It does not let you subtract one const X* pointer from another in
+ an arm of an if-expression whose if-part is not a constant
+ expression */
+ const char *g = "string";
+ pcpcc = &g + (g ? g-g : 0);
+ /* HPUX 7.0 cc rejects these. */
+ ++pcpcc;
+ ppc = (char**) pcpcc;
+ pcpcc = (char const *const *) ppc;
+ { /* SCO 3.2v4 cc rejects this sort of thing. */
+ char tx;
+ char *t = &tx;
+ char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+ *t++ = 0;
+ if (s) return 0;
+ }
+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
+ int x[] = {25, 17};
+ const int *foo = &x[0];
+ ++foo;
+ }
+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+ typedef const int *iptr;
+ iptr p = 0;
+ ++p;
+ }
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+ struct s { int j; const int *ap[3]; } bx;
+ struct s *b = &bx; b->j = 5;
+ }
+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+ const int foo = 10;
+ if (!foo) return 0;
+ }
+ return !cs[0] && !zero.x;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_const=yes
+else
+ ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+$as_echo "#define const /**/" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+case $ac_cv_c_inline in
+ inline | yes) ;;
+ *)
+ case $ac_cv_c_inline in
+ no) ac_val=;;
+ *) ac_val=$ac_cv_c_inline;;
+ esac
+ cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+ ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
+$as_echo_n "checking for working volatile... " >&6; }
+if ${ac_cv_c_volatile+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+volatile int x;
+int * volatile y = (int *) 0;
+return !x && !y;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_volatile=yes
+else
+ ac_cv_c_volatile=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
+$as_echo "$ac_cv_c_volatile" >&6; }
+if test $ac_cv_c_volatile = no; then
+
+$as_echo "#define volatile /**/" >>confdefs.h
+
+fi
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define mode_t int
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if ${ac_cv_type_signal+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <signal.h>
+
+int
+main ()
+{
+return *(signal (0, 0)) (0) == 1;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_type_signal=int
+else
+ ac_cv_type_signal=void
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>
+/* NetBSD declares sys_siglist in unistd.h. */
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SYS_SIGLIST $ac_have_decl
+_ACEOF
+
+
+
+
+
+
+ for ac_header in $ac_header_list
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+ if test $ac_cv_header_sys_socket_h = yes; then
+ SYS_SOCKET_H=''
+ else
+ for ac_header in winsock2.h ws2tcpip.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ SYS_SOCKET_H='sys/socket.h'
+ fi
+
+
+ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include <sys/types.h>
+ #if HAVE_SYS_SOCKET_H
+ # include <sys/socket.h>
+ #elif HAVE_WS2TCPIP_H
+ # include <ws2tcpip.h>
+ #endif
+"
+if test "x$ac_cv_type_socklen_t" = xyes; then :
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5
+$as_echo_n "checking for socklen_t equivalent... " >&6; }
+ if ${gl_cv_gl_cv_socklen_t_equiv+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Systems have either "struct sockaddr *" or
+ # "void *" as the second argument to getpeername
+ gl_cv_socklen_t_equiv=
+ for arg2 in "struct sockaddr" void; do
+ for t in int size_t "unsigned int" "long int" "unsigned long int"; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ #include <sys/socket.h>
+
+ int getpeername (int, $arg2 *, $t *);
+int
+main ()
+{
+$t len;
+ getpeername (0, 0, &len);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_socklen_t_equiv="$t"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test "$gl_cv_socklen_t_equiv" != "" && break
+ done
+ test "$gl_cv_socklen_t_equiv" != "" && break
+ done
+
+fi
+
+ if test "$gl_cv_socklen_t_equiv" = ""; then
+ as_fn_error $? "Cannot find a type to use in place of socklen_t" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5
+$as_echo "$gl_cv_socklen_t_equiv" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define socklen_t $gl_cv_socklen_t_equiv
+_ACEOF
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_addr" >&5
+$as_echo_n "checking for library containing inet_addr... " >&6; }
+if ${ac_cv_search_inet_addr+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inet_addr ();
+int
+main ()
+{
+return inet_addr ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' nsl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_inet_addr=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_inet_addr+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_inet_addr+:} false; then :
+
+else
+ ac_cv_search_inet_addr=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_addr" >&5
+$as_echo "$ac_cv_search_inet_addr" >&6; }
+ac_res=$ac_cv_search_inet_addr
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+# Check whether --enable-endian-check was given.
+if test "${enable_endian_check+set}" = set; then :
+ enableval=$enable_endian_check; endiancheck=$enableval
+else
+ endiancheck=yes
+fi
+
+
+if test x"$endiancheck" = xyes ; then
+
+ tmp_assumed_endian=big
+ tmp_assume_warn=""
+ if test "$cross_compiling" = yes; then
+ case "$host_cpu" in
+ i[345678]* )
+ tmp_assumed_endian=little
+ ;;
+ *)
+ ;;
+ esac
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking endianess" >&5
+$as_echo_n "checking endianess... " >&6; }
+ if ${gnupg_cv_c_endian+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gnupg_cv_c_endian=unknown
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ #include <sys/param.h>
+int
+main ()
+{
+
+ #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+ #endif
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ #include <sys/param.h>
+int
+main ()
+{
+
+ #if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+ #endif
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gnupg_cv_c_endian=big
+else
+ gnupg_cv_c_endian=little
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test "$gnupg_cv_c_endian" = unknown; then
+ if test "$cross_compiling" = yes; then :
+ gnupg_cv_c_endian=$tmp_assumed_endian
+ tmp_assumed_warn=" (assumed)"
+
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+main () {
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+ long l;
+ char c[sizeof (long)];
+ } u;
+ u.l = 1;
+ exit (u.c[sizeof (long) - 1] == 1);
+ }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ gnupg_cv_c_endian=little
+else
+ gnupg_cv_c_endian=big
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ fi
+
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${gnupg_cv_c_endian}${tmp_assumed_warn}" >&5
+$as_echo "${gnupg_cv_c_endian}${tmp_assumed_warn}" >&6; }
+ if test "$gnupg_cv_c_endian" = little; then
+
+$as_echo "#define LITTLE_ENDIAN_HOST 1" >>confdefs.h
+
+ else
+
+$as_echo "#define BIG_ENDIAN_HOST 1" >>confdefs.h
+
+ fi
+
+fi
+
+# fixme: we should get rid of the byte type
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for byte typedef" >&5
+$as_echo_n "checking for byte typedef... " >&6; }
+ if ${gnupg_cv_typedef_byte+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _GNU_SOURCE 1
+ #include <stdlib.h>
+ #include <sys/types.h>
+int
+main ()
+{
+
+ #undef byte
+ int a = sizeof(byte);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gnupg_cv_typedef_byte=yes
+else
+ gnupg_cv_typedef_byte=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_typedef_byte" >&5
+$as_echo "$gnupg_cv_typedef_byte" >&6; }
+ if test "$gnupg_cv_typedef_byte" = yes; then
+
+$as_echo "#define HAVE_BYTE_TYPEDEF 1" >>confdefs.h
+
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ushort typedef" >&5
+$as_echo_n "checking for ushort typedef... " >&6; }
+ if ${gnupg_cv_typedef_ushort+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _GNU_SOURCE 1
+ #include <stdlib.h>
+ #include <sys/types.h>
+int
+main ()
+{
+
+ #undef ushort
+ int a = sizeof(ushort);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gnupg_cv_typedef_ushort=yes
+else
+ gnupg_cv_typedef_ushort=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_typedef_ushort" >&5
+$as_echo "$gnupg_cv_typedef_ushort" >&6; }
+ if test "$gnupg_cv_typedef_ushort" = yes; then
+
+$as_echo "#define HAVE_USHORT_TYPEDEF 1" >>confdefs.h
+
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ulong typedef" >&5
+$as_echo_n "checking for ulong typedef... " >&6; }
+ if ${gnupg_cv_typedef_ulong+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _GNU_SOURCE 1
+ #include <stdlib.h>
+ #include <sys/types.h>
+int
+main ()
+{
+
+ #undef ulong
+ int a = sizeof(ulong);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gnupg_cv_typedef_ulong=yes
+else
+ gnupg_cv_typedef_ulong=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_typedef_ulong" >&5
+$as_echo "$gnupg_cv_typedef_ulong" >&6; }
+ if test "$gnupg_cv_typedef_ulong" = yes; then
+
+$as_echo "#define HAVE_ULONG_TYPEDEF 1" >>confdefs.h
+
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for u16 typedef" >&5
+$as_echo_n "checking for u16 typedef... " >&6; }
+ if ${gnupg_cv_typedef_u16+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _GNU_SOURCE 1
+ #include <stdlib.h>
+ #include <sys/types.h>
+int
+main ()
+{
+
+ #undef u16
+ int a = sizeof(u16);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gnupg_cv_typedef_u16=yes
+else
+ gnupg_cv_typedef_u16=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_typedef_u16" >&5
+$as_echo "$gnupg_cv_typedef_u16" >&6; }
+ if test "$gnupg_cv_typedef_u16" = yes; then
+
+$as_echo "#define HAVE_U16_TYPEDEF 1" >>confdefs.h
+
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for u32 typedef" >&5
+$as_echo_n "checking for u32 typedef... " >&6; }
+ if ${gnupg_cv_typedef_u32+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _GNU_SOURCE 1
+ #include <stdlib.h>
+ #include <sys/types.h>
+int
+main ()
+{
+
+ #undef u32
+ int a = sizeof(u32);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gnupg_cv_typedef_u32=yes
+else
+ gnupg_cv_typedef_u32=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_typedef_u32" >&5
+$as_echo "$gnupg_cv_typedef_u32" >&6; }
+ if test "$gnupg_cv_typedef_u32" = yes; then
+
+$as_echo "#define HAVE_U32_TYPEDEF 1" >>confdefs.h
+
+ fi
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned short" >&5
+$as_echo_n "checking size of unsigned short... " >&6; }
+if ${ac_cv_sizeof_unsigned_short+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned short))" "ac_cv_sizeof_unsigned_short" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_unsigned_short" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (unsigned short)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_unsigned_short=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_short" >&5
+$as_echo "$ac_cv_sizeof_unsigned_short" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UNSIGNED_SHORT $ac_cv_sizeof_unsigned_short
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5
+$as_echo_n "checking size of unsigned int... " >&6; }
+if ${ac_cv_sizeof_unsigned_int+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_unsigned_int" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (unsigned int)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_unsigned_int=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5
+$as_echo "$ac_cv_sizeof_unsigned_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5
+$as_echo_n "checking size of unsigned long... " >&6; }
+if ${ac_cv_sizeof_unsigned_long+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_unsigned_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (unsigned long)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_unsigned_long=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5
+$as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long" >&5
+$as_echo_n "checking size of unsigned long long... " >&6; }
+if ${ac_cv_sizeof_unsigned_long_long+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long))" "ac_cv_sizeof_unsigned_long_long" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_unsigned_long_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (unsigned long long)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_unsigned_long_long=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long" >&5
+$as_echo "$ac_cv_sizeof_unsigned_long_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long
+_ACEOF
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_time=yes
+else
+ ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
+
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+fi
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
+$as_echo_n "checking size of time_t... " >&6; }
+if ${ac_cv_sizeof_time_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "
+#include <stdio.h>
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
+"; then :
+
+else
+ if test "$ac_cv_type_time_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (time_t)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_time_t=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5
+$as_echo "$ac_cv_sizeof_time_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_TIME_T $ac_cv_sizeof_time_t
+_ACEOF
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time_t is unsigned" >&5
+$as_echo_n "checking whether time_t is unsigned... " >&6; }
+if ${gnupg_cv_time_t_unsigned+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
+int
+main ()
+{
+static int test_array [1 - 2 * !(((time_t)-1) < 0)];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gnupg_cv_time_t_unsigned=no
+else
+ gnupg_cv_time_t_unsigned=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_time_t_unsigned" >&5
+$as_echo "$gnupg_cv_time_t_unsigned" >&6; }
+ if test $gnupg_cv_time_t_unsigned = yes; then
+
+$as_echo "#define HAVE_UNSIGNED_TIME_T 1" >>confdefs.h
+
+ fi
+
+
+
+if test "$ac_cv_sizeof_unsigned_short" = "0" \
+ || test "$ac_cv_sizeof_unsigned_int" = "0" \
+ || test "$ac_cv_sizeof_unsigned_long" = "0"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Hmmm, something is wrong with the sizes - using defaults" >&5
+$as_echo "$as_me: WARNING: Hmmm, something is wrong with the sizes - using defaults" >&2;};
+fi
+
+
+#
+# Checks for library functions.
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library functions" >&5
+$as_echo "$as_me: checking for library functions" >&6;}
+ac_fn_c_check_decl "$LINENO" "getpagesize" "ac_cv_have_decl_getpagesize" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getpagesize" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETPAGESIZE $ac_have_decl
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_source+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h> /* for off_t */
+ #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_sys_largefile_source=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _LARGEFILE_SOURCE 1
+#include <sys/types.h> /* for off_t */
+ #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_sys_largefile_source=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_cv_sys_largefile_source=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
+$as_echo "$ac_cv_sys_largefile_source" >&6; }
+case $ac_cv_sys_largefile_source in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+_ACEOF
+;;
+esac
+rm -rf conftest*
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+if test $ac_cv_sys_largefile_source != unknown; then
+
+$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
+
+fi
+
+for ac_func in vprintf
+do :
+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+if test "x$ac_cv_func_vprintf" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_VPRINTF 1
+_ACEOF
+
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = xyes; then :
+
+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
+
+fi
+
+fi
+done
+
+
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
+
+fi
+
+for ac_header in vfork.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
+if test "x$ac_cv_header_vfork_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_VFORK_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_func in fork vfork
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+if test "x$ac_cv_func_fork" = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+$as_echo_n "checking for working fork... " >&6; }
+if ${ac_cv_func_fork_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ ac_cv_func_fork_works=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+
+ /* By Ruediger Kuhlmann. */
+ return fork () < 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_func_fork_works=yes
+else
+ ac_cv_func_fork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+$as_echo "$ac_cv_func_fork_works" >&6; }
+
+else
+ ac_cv_func_fork_works=$ac_cv_func_fork
+fi
+if test "x$ac_cv_func_fork_works" = xcross; then
+ case $host in
+ *-*-amigaos* | *-*-msdosdjgpp*)
+ # Override, as these systems have only a dummy fork() stub
+ ac_cv_func_fork_works=no
+ ;;
+ *)
+ ac_cv_func_fork_works=yes
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+fi
+ac_cv_func_vfork_works=$ac_cv_func_vfork
+if test "x$ac_cv_func_vfork" = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+$as_echo_n "checking for working vfork... " >&6; }
+if ${ac_cv_func_vfork_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ ac_cv_func_vfork_works=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Thanks to Paul Eggert for this test. */
+$ac_includes_default
+#include <sys/wait.h>
+#ifdef HAVE_VFORK_H
+# include <vfork.h>
+#endif
+/* On some sparc systems, changes by the child to local and incoming
+ argument registers are propagated back to the parent. The compiler
+ is told about this with #include <vfork.h>, but some compilers
+ (e.g. gcc -O) don't grok <vfork.h>. Test for this by using a
+ static variable whose address is put into a register that is
+ clobbered by the vfork. */
+static void
+#ifdef __cplusplus
+sparc_address_test (int arg)
+# else
+sparc_address_test (arg) int arg;
+#endif
+{
+ static pid_t child;
+ if (!child) {
+ child = vfork ();
+ if (child < 0) {
+ perror ("vfork");
+ _exit(2);
+ }
+ if (!child) {
+ arg = getpid();
+ write(-1, "", 0);
+ _exit (arg);
+ }
+ }
+}
+
+int
+main ()
+{
+ pid_t parent = getpid ();
+ pid_t child;
+
+ sparc_address_test (0);
+
+ child = vfork ();
+
+ if (child == 0) {
+ /* Here is another test for sparc vfork register problems. This
+ test uses lots of local variables, at least as many local
+ variables as main has allocated so far including compiler
+ temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris
+ 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should
+ reuse the register of parent for one of the local variables,
+ since it will think that parent can't possibly be used any more
+ in this routine. Assigning to the local variable will thus
+ munge parent in the parent process. */
+ pid_t
+ p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
+ p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
+ /* Convince the compiler that p..p7 are live; otherwise, it might
+ use the same hardware register for all 8 local variables. */
+ if (p != p1 || p != p2 || p != p3 || p != p4
+ || p != p5 || p != p6 || p != p7)
+ _exit(1);
+
+ /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
+ from child file descriptors. If the child closes a descriptor
+ before it execs or exits, this munges the parent's descriptor
+ as well. Test for this by closing stdout in the child. */
+ _exit(close(fileno(stdout)) != 0);
+ } else {
+ int status;
+ struct stat st;
+
+ while (wait(&status) != child)
+ ;
+ return (
+ /* Was there some problem with vforking? */
+ child < 0
+
+ /* Did the child fail? (This shouldn't happen.) */
+ || status
+
+ /* Did the vfork/compiler bug occur? */
+ || parent != getpid()
+
+ /* Did the file descriptor bug occur? */
+ || fstat(fileno(stdout), &st) != 0
+ );
+ }
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_func_vfork_works=yes
+else
+ ac_cv_func_vfork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+$as_echo "$ac_cv_func_vfork_works" >&6; }
+
+fi;
+if test "x$ac_cv_func_fork_works" = xcross; then
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+fi
+
+if test "x$ac_cv_func_vfork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
+
+else
+
+$as_echo "#define vfork fork" >>confdefs.h
+
+fi
+if test "x$ac_cv_func_fork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
+
+fi
+
+for ac_func in strerror strlwr tcgetattr mmap canonicalize_file_name
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in strcasecmp strncasecmp ctermid times gmtime_r strtoull
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in setenv unsetenv fcntl ftruncate inet_ntop
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in canonicalize_file_name
+do :
+ ac_fn_c_check_func "$LINENO" "canonicalize_file_name" "ac_cv_func_canonicalize_file_name"
+if test "x$ac_cv_func_canonicalize_file_name" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_CANONICALIZE_FILE_NAME 1
+_ACEOF
+
+fi
+done
+
+for ac_func in gettimeofday getrusage getrlimit setrlimit clock_gettime
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in atexit raise getpagesize strftime nl_langinfo setlocale
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in waitpid wait4 sigaction sigprocmask pipe getaddrinfo
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in ttyname rand ftello fsync stat lstat
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in memicmp stpcpy strsep strlwr strtoul memmove stricmp strtol \
+ memrchr isascii timegm getrusage setrlimit stat setlocale \
+ flockfile funlockfile fopencookie funopen getpwnam getpwuid \
+ getenv inet_pton strpbrk
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+if test "$have_android_system" = yes; then
+ # On Android ttyname is a stub but prints an error message.
+
+$as_echo "#define HAVE_BROKEN_TTYNAME 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_type "$LINENO" "struct sigaction" "ac_cv_type_struct_sigaction" "#include <signal.h>
+"
+if test "x$ac_cv_type_struct_sigaction" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SIGACTION 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#include <signal.h>
+"
+if test "x$ac_cv_type_sigset_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGSET_T 1
+_ACEOF
+
+
+fi
+
+
+# Dirmngr requires mmap on Unix systems.
+if test $ac_cv_func_mmap != yes -a $mmap_needed = yes; then
+ as_fn_error $? "Sorry, the current implemenation requires mmap." "$LINENO" 5
+fi
+
+#
+# W32 specific test
+#
+for ac_header in sys/stat.h unistd.h direct.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if mkdir takes one argument" >&5
+$as_echo_n "checking if mkdir takes one argument... " >&6; }
+if ${gnupg_cv_mkdir_takes_one_arg+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#ifdef HAVE_DIRECT_H
+# include <direct.h>
+#endif
+int
+main ()
+{
+mkdir ("foo", 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gnupg_cv_mkdir_takes_one_arg=no
+else
+ gnupg_cv_mkdir_takes_one_arg=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_mkdir_takes_one_arg" >&5
+$as_echo "$gnupg_cv_mkdir_takes_one_arg" >&6; }
+if test $gnupg_cv_mkdir_takes_one_arg = yes ; then
+
+$as_echo "#define MKDIR_TAKES_ONE_ARG 1" >>confdefs.h
+
+fi
+
+
+#
+# Sanity check regex. Tests adapted from mutt.
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether regular expression support is requested" >&5
+$as_echo_n "checking whether regular expression support is requested... " >&6; }
+# Check whether --enable-regex was given.
+if test "${enable_regex+set}" = set; then :
+ enableval=$enable_regex; use_regex=$enableval
+else
+ use_regex=yes
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_regex" >&5
+$as_echo "$use_regex" >&6; }
+
+if test "$use_regex" = yes ; then
+ _cppflags="${CPPFLAGS}"
+ _ldflags="${LDFLAGS}"
+
+# Check whether --with-regex was given.
+if test "${with_regex+set}" = set; then :
+ withval=$with_regex;
+ if test -d "$withval" ; then
+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
+ LDFLAGS="${LDFLAGS} -L$withval/lib"
+ fi
+
+else
+ withval=""
+fi
+
+
+ # Does the system have regex functions at all?
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
+$as_echo_n "checking for library containing regcomp... " >&6; }
+if ${ac_cv_search_regcomp+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char regcomp ();
+int
+main ()
+{
+return regcomp ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' regex; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_regcomp=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_regcomp+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_regcomp+:} false; then :
+
+else
+ ac_cv_search_regcomp=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcomp" >&5
+$as_echo "$ac_cv_search_regcomp" >&6; }
+ac_res=$ac_cv_search_regcomp
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+ ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp"
+if test "x$ac_cv_func_regcomp" = xyes; then :
+ gnupg_cv_have_regex=yes
+else
+ gnupg_cv_have_regex=no
+fi
+
+
+ if test $gnupg_cv_have_regex = no; then
+ use_regex=no
+ else
+ if test x"$cross_compiling" = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling; assuming regexp libray is not broken" >&5
+$as_echo "$as_me: WARNING: cross compiling; assuming regexp libray is not broken" >&2;}
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system's regexp library is broken" >&5
+$as_echo_n "checking whether your system's regexp library is broken... " >&6; }
+if ${gnupg_cv_regex_broken+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ gnupg_cv_regex_broken=yes
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <unistd.h>
+#include <regex.h>
+main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ gnupg_cv_regex_broken=no
+else
+ gnupg_cv_regex_broken=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_regex_broken" >&5
+$as_echo "$gnupg_cv_regex_broken" >&6; }
+
+ if test $gnupg_cv_regex_broken = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your regex is broken - disabling regex use" >&5
+$as_echo "$as_me: WARNING: your regex is broken - disabling regex use" >&2;}
+ use_regex=no
+ fi
+ fi
+ fi
+ CPPFLAGS="${_cppflags}"
+ LDFLAGS="${_ldflags}"
+fi
+
+if test "$use_regex" != yes ; then
+
+$as_echo "#define DISABLE_REGEX 1" >>confdefs.h
+
+fi
+ if test x"$use_regex" != xyes; then
+ DISABLE_REGEX_TRUE=
+ DISABLE_REGEX_FALSE='#'
+else
+ DISABLE_REGEX_TRUE='#'
+ DISABLE_REGEX_FALSE=
+fi
+
+
+
+
+#
+# Do we have zlib? Must do it here because Solaris failed
+# when compiling a conftest (due to the "-lz" from LIBS).
+# Note that we combine zlib and bzlib2 in ZLIBS.
+#
+if test "$use_zip" = yes ; then
+ _cppflags="${CPPFLAGS}"
+ _ldflags="${LDFLAGS}"
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+ withval=$with_zlib;
+ if test -d "$withval"; then
+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
+ LDFLAGS="${LDFLAGS} -L$withval/lib"
+ fi
+
+fi
+
+
+ ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflateInit2_ in -lz" >&5
+$as_echo_n "checking for deflateInit2_ in -lz... " >&6; }
+if ${ac_cv_lib_z_deflateInit2_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char deflateInit2_ ();
+int
+main ()
+{
+return deflateInit2_ ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_z_deflateInit2_=yes
+else
+ ac_cv_lib_z_deflateInit2_=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflateInit2_" >&5
+$as_echo "$ac_cv_lib_z_deflateInit2_" >&6; }
+if test "x$ac_cv_lib_z_deflateInit2_" = xyes; then :
+
+ ZLIBS="-lz"
+
+$as_echo "#define HAVE_ZIP 1" >>confdefs.h
+
+
+else
+ CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}
+fi
+
+else
+ CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}
+fi
+
+
+fi
+
+
+#
+# Check whether we can support bzip2
+#
+if test "$use_bzip2" = yes ; then
+ _cppflags="${CPPFLAGS}"
+ _ldflags="${LDFLAGS}"
+
+# Check whether --with-bzip2 was given.
+if test "${with_bzip2+set}" = set; then :
+ withval=$with_bzip2;
+ if test -d "$withval" ; then
+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
+ LDFLAGS="${LDFLAGS} -L$withval/lib"
+ fi
+
+else
+ withval=""
+fi
+
+
+ # Checking alongside stdio.h as an early version of bzip2 (1.0)
+ # required stdio.h to be included before bzlib.h, and Solaris 9 is
+ # woefully out of date.
+ if test "$withval" != no ; then
+ ac_fn_c_check_header_compile "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "#include <stdio.h>
+"
+if test "x$ac_cv_header_bzlib_h" = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompressInit in -lbz2" >&5
+$as_echo_n "checking for BZ2_bzCompressInit in -lbz2... " >&6; }
+if ${ac_cv_lib_bz2_BZ2_bzCompressInit+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbz2 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char BZ2_bzCompressInit ();
+int
+main ()
+{
+return BZ2_bzCompressInit ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bz2_BZ2_bzCompressInit=yes
+else
+ ac_cv_lib_bz2_BZ2_bzCompressInit=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompressInit" >&5
+$as_echo "$ac_cv_lib_bz2_BZ2_bzCompressInit" >&6; }
+if test "x$ac_cv_lib_bz2_BZ2_bzCompressInit" = xyes; then :
+
+ have_bz2=yes
+ ZLIBS="$ZLIBS -lbz2"
+
+$as_echo "#define HAVE_BZIP2 1" >>confdefs.h
+
+
+else
+ CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}
+fi
+
+else
+ CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}
+fi
+
+
+ fi
+fi
+ if test x"$have_bz2" = "xyes"; then
+ ENABLE_BZIP2_SUPPORT_TRUE=
+ ENABLE_BZIP2_SUPPORT_FALSE='#'
+else
+ ENABLE_BZIP2_SUPPORT_TRUE='#'
+ ENABLE_BZIP2_SUPPORT_FALSE=
+fi
+
+
+
+
+# Check for readline support
+
+
+# Check whether --with-readline was given.
+if test "${with_readline+set}" = set; then :
+ withval=$with_readline; _do_readline=$withval
+else
+ _do_readline=yes
+fi
+
+
+ gnupg_cv_have_readline=no
+ if test "$_do_readline" != "no" ; then
+ if test -d "$withval" ; then
+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
+ LDFLAGS="${LDFLAGS} -L$withval/lib"
+ fi
+
+ for _termcap in "" "-ltermcap" "-lcurses" "-lncurses" ; do
+ _readline_save_libs=$LIBS
+ _combo="-lreadline${_termcap:+ $_termcap}"
+ LIBS="$LIBS $_combo"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline via \"$_combo\" is present and sane" >&5
+$as_echo_n "checking whether readline via \"$_combo\" is present and sane... " >&6; }
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdio.h>
+#include <readline/readline.h>
+#include <readline/history.h>
+
+int
+main ()
+{
+
+rl_completion_func_t *completer;
+add_history("foobar");
+rl_catch_signals=0;
+rl_inhibit_completion=0;
+rl_attempted_completion_function=NULL;
+rl_completion_matches(NULL,NULL);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ _found_readline=yes
+else
+ _found_readline=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_found_readline" >&5
+$as_echo "$_found_readline" >&6; }
+
+ LIBS=$_readline_save_libs
+
+ if test $_found_readline = yes ; then
+
+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
+
+ LIBREADLINE=$_combo
+
+ gnupg_cv_have_readline=yes
+ break
+ fi
+ done
+
+ unset _termcap
+ unset _readline_save_libs
+ unset _combo
+ unset _found_readline
+ fi
+
+
+
+if test "$development_version" = yes; then
+
+$as_echo "#define IS_DEVELOPMENT_VERSION 1" >>confdefs.h
+
+fi
+
+ if test x$cross_compiling = xyes; then
+ CROSS_COMPILING_TRUE=
+ CROSS_COMPILING_FALSE='#'
+else
+ CROSS_COMPILING_TRUE='#'
+ CROSS_COMPILING_FALSE=
+fi
+
+
+
+ if ${MAKE-make} --version 2>/dev/null | grep '^GNU ' >/dev/null 2>&1; then
+ :
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** It seems that you are not using GNU make. Some make tools have serious
+*** flaws and you may not be able to build this software at all. Before you
+*** complain, please try GNU make: GNU make is easy to build and available
+*** at all GNU archives. It is always available from ftp.gnu.org:/gnu/make.
+***" >&5
+$as_echo "$as_me: WARNING:
+***
+*** It seems that you are not using GNU make. Some make tools have serious
+*** flaws and you may not be able to build this software at all. Before you
+*** complain, please try GNU make: GNU make is easy to build and available
+*** at all GNU archives. It is always available from ftp.gnu.org:/gnu/make.
+***" >&2;}
+ fi
+
+
+# Add some extra libs here so that previous tests don't fail for
+# mysterious reasons - the final link step should bail out.
+# W32SOCKLIBS is also defined so that if can be used for tools not
+# requiring any network stuff but linking to code in libcommon which
+# tracks in winsock stuff (e.g. init_common_subsystems).
+if test "$have_w32_system" = yes; then
+ if test "$have_w32ce_system" = yes; then
+ W32SOCKLIBS="-lws2"
+ else
+ W32SOCKLIBS="-lws2_32"
+ fi
+ NETLIBS="${NETLIBS} ${W32SOCKLIBS}"
+fi
+
+
+
+
+#
+# Setup gcc specific options
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cc features" >&5
+$as_echo "$as_me: checking for cc features" >&6;}
+if test "$GCC" = yes; then
++ mycflags=
++ mycflags_save=$CFLAGS
++
+ # Check whether gcc does not emit a diagnositc for unknow -Wno-*
+ # options. This is the case for gcc >= 4.6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc ignores unknown -Wno-* options" >&5
+$as_echo_n "checking if gcc ignores unknown -Wno-* options... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6 )
+#kickerror
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ _gcc_silent_wno=yes
+else
+ _gcc_silent_wno=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_gcc_silent_wno" >&5
+$as_echo "$_gcc_silent_wno" >&6; }
+
+ # Note that it is okay to use CFLAGS here because these are just
+ # warning options and the user should have a chance of overriding
+ # them.
+ if test "$USE_MAINTAINER_MODE" = "yes"; then
- CFLAGS="$CFLAGS -O3 -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
- CFLAGS="$CFLAGS -Wformat -Wno-format-y2k -Wformat-security"
++ mycflags="$mycflags -O3 -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
++ mycflags="$mycflags -Wformat -Wno-format-y2k -Wformat-security"
+ if test x"$_gcc_silent_wno" = xyes ; then
+ _gcc_wopt=yes
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports -Wno-missing-field-initializers" >&5
+$as_echo_n "checking if gcc supports -Wno-missing-field-initializers... " >&6; }
- _gcc_cflags_save=$CFLAGS
+ CFLAGS="-Wno-missing-field-initializers"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ _gcc_wopt=yes
+else
+ _gcc_wopt=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_gcc_wopt" >&5
+$as_echo "$_gcc_wopt" >&6; }
- CFLAGS=$_gcc_cflags_save;
+ fi
+ if test x"$_gcc_wopt" = xyes ; then
- CFLAGS="$CFLAGS -W -Wno-sign-compare -Wno-missing-field-initializers"
++ mycflags="$mycflags -W -Wno-sign-compare"
++ mycflags="$mycflags -Wno-missing-field-initializers"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports -Wdeclaration-after-statement" >&5
+$as_echo_n "checking if gcc supports -Wdeclaration-after-statement... " >&6; }
- _gcc_cflags_save=$CFLAGS
+ CFLAGS="-Wdeclaration-after-statement"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ _gcc_wopt=yes
+else
+ _gcc_wopt=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_gcc_wopt" >&5
+$as_echo "$_gcc_wopt" >&6; }
- CFLAGS=$_gcc_cflags_save;
+ if test x"$_gcc_wopt" = xyes ; then
- CFLAGS="$CFLAGS -Wdeclaration-after-statement"
++ mycflags="$mycflags -Wdeclaration-after-statement"
+ fi
+ else
- CFLAGS="$CFLAGS -Wall"
++ mycflags="$mycflags -Wall"
+ fi
+
+ if test x"$_gcc_silent_wno" = xyes ; then
+ _gcc_psign=yes
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports -Wno-pointer-sign" >&5
+$as_echo_n "checking if gcc supports -Wno-pointer-sign... " >&6; }
- _gcc_cflags_save=$CFLAGS
+ CFLAGS="-Wno-pointer-sign"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ _gcc_psign=yes
+else
+ _gcc_psign=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_gcc_psign" >&5
+$as_echo "$_gcc_psign" >&6; }
- CFLAGS=$_gcc_cflags_save;
+ fi
+ if test x"$_gcc_psign" = xyes ; then
- CFLAGS="$CFLAGS -Wno-pointer-sign"
++ mycflags="$mycflags -Wno-pointer-sign"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports -Wpointer-arith" >&5
+$as_echo_n "checking if gcc supports -Wpointer-arith... " >&6; }
- _gcc_cflags_save=$CFLAGS
+ CFLAGS="-Wpointer-arith"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ _gcc_psign=yes
+else
+ _gcc_psign=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_gcc_psign" >&5
+$as_echo "$_gcc_psign" >&6; }
- CFLAGS=$_gcc_cflags_save;
+ if test x"$_gcc_psign" = xyes ; then
- CFLAGS="$CFLAGS -Wpointer-arith"
++ mycflags="$mycflags -Wpointer-arith"
+ fi
++
++ CFLAGS="$mycflags $mycflags_save"
+fi
+
+
+#
+# This is handy for debugging so the compiler doesn't rearrange
+# things and eliminate variables.
+#
+# Check whether --enable-optimization was given.
+if test "${enable_optimization+set}" = set; then :
+ enableval=$enable_optimization; if test $enableval = no ; then
+ CFLAGS=`echo $CFLAGS | sed s/-O[1-9]\ /-O0\ /g`
+ fi
+fi
+
+
+#
+# Decide what to build
+#
+
+build_scdaemon_extra=""
+if test "$build_scdaemon" = "yes"; then
+ if test $have_libusb = no; then
+ build_scdaemon_extra="without internal CCID driver"
+ fi
+ if test -n "$build_scdaemon_extra"; then
+ build_scdaemon_extra="(${build_scdaemon_extra})"
+ fi
+fi
+
+
+#
+# Set variables for use by automake makefiles.
+#
+ if test "$build_gpg" = "yes"; then
+ BUILD_GPG_TRUE=
+ BUILD_GPG_FALSE='#'
+else
+ BUILD_GPG_TRUE='#'
+ BUILD_GPG_FALSE=
+fi
+
+ if test "$build_gpgsm" = "yes"; then
+ BUILD_GPGSM_TRUE=
+ BUILD_GPGSM_FALSE='#'
+else
+ BUILD_GPGSM_TRUE='#'
+ BUILD_GPGSM_FALSE=
+fi
+
+ if test "$build_agent" = "yes"; then
+ BUILD_AGENT_TRUE=
+ BUILD_AGENT_FALSE='#'
+else
+ BUILD_AGENT_TRUE='#'
+ BUILD_AGENT_FALSE=
+fi
+
+ if test "$build_scdaemon" = "yes"; then
+ BUILD_SCDAEMON_TRUE=
+ BUILD_SCDAEMON_FALSE='#'
+else
+ BUILD_SCDAEMON_TRUE='#'
+ BUILD_SCDAEMON_FALSE=
+fi
+
+ if test "$build_g13" = "yes"; then
+ BUILD_G13_TRUE=
+ BUILD_G13_FALSE='#'
+else
+ BUILD_G13_TRUE='#'
+ BUILD_G13_FALSE=
+fi
+
+ if test "$build_dirmngr" = "yes"; then
+ BUILD_DIRMNGR_TRUE=
+ BUILD_DIRMNGR_FALSE='#'
+else
+ BUILD_DIRMNGR_TRUE='#'
+ BUILD_DIRMNGR_FALSE=
+fi
+
+ if test "$build_tools" = "yes"; then
+ BUILD_TOOLS_TRUE=
+ BUILD_TOOLS_FALSE='#'
+else
+ BUILD_TOOLS_TRUE='#'
+ BUILD_TOOLS_FALSE=
+fi
+
+ if test "$build_doc" = "yes"; then
+ BUILD_DOC_TRUE=
+ BUILD_DOC_FALSE='#'
+else
+ BUILD_DOC_TRUE='#'
+ BUILD_DOC_FALSE=
+fi
+
+ if test "$build_symcryptrun" = "yes"; then
+ BUILD_SYMCRYPTRUN_TRUE=
+ BUILD_SYMCRYPTRUN_FALSE='#'
+else
+ BUILD_SYMCRYPTRUN_TRUE='#'
+ BUILD_SYMCRYPTRUN_FALSE=
+fi
+
+ if test "$build_gpgtar" = "yes"; then
+ BUILD_GPGTAR_TRUE=
+ BUILD_GPGTAR_FALSE='#'
+else
+ BUILD_GPGTAR_TRUE='#'
+ BUILD_GPGTAR_FALSE=
+fi
+
+
+ if test "$card_support" = yes; then
+ ENABLE_CARD_SUPPORT_TRUE=
+ ENABLE_CARD_SUPPORT_FALSE='#'
+else
+ ENABLE_CARD_SUPPORT_TRUE='#'
+ ENABLE_CARD_SUPPORT_FALSE=
+fi
+
+ if test "$use_trust_models" = no; then
+ NO_TRUST_MODELS_TRUE=
+ NO_TRUST_MODELS_FALSE='#'
+else
+ NO_TRUST_MODELS_TRUE='#'
+ NO_TRUST_MODELS_FALSE=
+fi
+
++ if test "$use_tofu" = yes; then
++ USE_TOFU_TRUE=
++ USE_TOFU_FALSE='#'
++else
++ USE_TOFU_TRUE='#'
++ USE_TOFU_FALSE=
++fi
++
+
+ if test x$cross_compiling = xno -a "$build_gpg" = yes ; then
+ RUN_GPG_TESTS_TRUE=
+ RUN_GPG_TESTS_FALSE='#'
+else
+ RUN_GPG_TESTS_TRUE='#'
+ RUN_GPG_TESTS_FALSE=
+fi
+
+
+#
+# Set some defines for use gpgconf.
+#
+if test "$build_gpg" = yes ; then
+
+$as_echo "#define BUILD_WITH_GPG 1" >>confdefs.h
+
+fi
+if test "$build_gpgsm" = yes ; then
+
+$as_echo "#define BUILD_WITH_GPGSM 1" >>confdefs.h
+
+fi
+if test "$build_agent" = yes ; then
+
+$as_echo "#define BUILD_WITH_AGENT 1" >>confdefs.h
+
+fi
+if test "$build_scdaemon" = yes ; then
+
+$as_echo "#define BUILD_WITH_SCDAEMON 1" >>confdefs.h
+
+fi
+if test "$build_dirmngr" = yes ; then
+
+$as_echo "#define BUILD_WITH_DIRMNGR 1" >>confdefs.h
+
+fi
+if test "$build_g13" = yes ; then
+
+$as_echo "#define BUILD_WITH_G13 1" >>confdefs.h
+
+fi
+
+
+#
+# Define Name strings
+#
+
+cat >>confdefs.h <<_ACEOF
+#define GNUPG_NAME "GnuPG"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPG_NAME "gpg"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPG_DISP_NAME "GnuPG"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPGSM_NAME "gpgsm"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPGSM_DISP_NAME "GPGSM"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPG_AGENT_NAME "gpg-agent"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPG_AGENT_DISP_NAME "GPG Agent"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SCDAEMON_NAME "scdaemon"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define SCDAEMON_DISP_NAME "SCDaemon"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define DIRMNGR_NAME "dirmngr"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DIRMNGR_DISP_NAME "DirMngr"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define G13_NAME "g13"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define G13_DISP_NAME "G13"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPGCONF_NAME "gpgconf"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPGCONF_DISP_NAME "GPGConf"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPGTAR_NAME "gpgtar"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPG_AGENT_SOCK_NAME "S.gpg-agent"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPG_AGENT_SSH_SOCK_NAME "S.gpg-agent.ssh"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DIRMNGR_INFO_NAME "DIRMNGR_INFO"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define SCDAEMON_SOCK_NAME "S.scdaemon"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DIRMNGR_SOCK_NAME "S.dirmngr"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GPGEXT_GPG "gpg"
+_ACEOF
+
+
+if test "$have_w32_system" = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define GNUPG_REGISTRY_DIR "\\\\Software\\\\GNU\\\\GnuPG"
+_ACEOF
+
+fi
+
+
+#
+# Provide information about the build.
+#
- BUILD_REVISION="086b873"
++BUILD_REVISION="9fadfdb"
+
+
+cat >>confdefs.h <<_ACEOF
+#define BUILD_REVISION "$BUILD_REVISION"
+_ACEOF
+
+
+BUILD_VERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
- BUILD_VERSION="${BUILD_VERSION}2155"
++BUILD_VERSION="${BUILD_VERSION}40877"
+BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
+
+
+
+# Check whether --enable-build-timestamp was given.
+if test "${enable_build_timestamp+set}" = set; then :
+ enableval=$enable_build_timestamp; if test "$enableval" = "yes"; then
+ BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
+ else
+ BUILD_TIMESTAMP="$enableval"
+ fi
+else
+ BUILD_TIMESTAMP="<none>"
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define BUILD_TIMESTAMP "$BUILD_TIMESTAMP"
+_ACEOF
+
+BUILD_HOSTNAME="$ac_hostname"
+
+
+
+#
+# Print errors here so that they are visible all
+# together and the user can acquire them all together.
+#
+die=no
+if test "$have_gpg_error" = "no"; then
+ die=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
+***
+*** You need libgpg-error to build this program.
+** This library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/libgpg-error
+*** (at least version $NEED_GPG_ERROR_VERSION is required.)
+***" >&5
+$as_echo "$as_me:
+***
+*** You need libgpg-error to build this program.
+** This library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/libgpg-error
+*** (at least version $NEED_GPG_ERROR_VERSION is required.)
+***" >&6;}
+fi
+if test "$have_libgcrypt" = "no"; then
+ die=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
+***
+*** You need libgcrypt to build this program.
+** This library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) is required.)
+***" >&5
+$as_echo "$as_me:
+***
+*** You need libgcrypt to build this program.
+** This library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) is required.)
+***" >&6;}
+fi
+if test "$have_libassuan" = "no"; then
+ die=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
+***
+*** You need libassuan to build this program.
+*** This library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/libassuan/
+*** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required).
+***" >&5
+$as_echo "$as_me:
+***
+*** You need libassuan to build this program.
+*** This library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/libassuan/
+*** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required).
+***" >&6;}
+fi
+if test "$have_ksba" = "no"; then
+ die=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
+***
+*** You need libksba to build this program.
+*** This library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/libksba/
+*** (at least version $NEED_KSBA_VERSION using API $NEED_KSBA_API is required).
+***" >&5
+$as_echo "$as_me:
+***
+*** You need libksba to build this program.
+*** This library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/libksba/
+*** (at least version $NEED_KSBA_VERSION using API $NEED_KSBA_API is required).
+***" >&6;}
+fi
+if test "$gnupg_have_ldap" = yes; then
+ if test "$have_w32ce_system" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
+*** Note that CeGCC might be broken, a package fixing this is:
+*** http://files.kolab.org/local/windows-ce/
+*** source/wldap32_0.1-mingw32ce.orig.tar.gz
+*** binary/wldap32-ce-arm-dev_0.1-1_all.deb
+***" >&5
+$as_echo "$as_me:
+*** Note that CeGCC might be broken, a package fixing this is:
+*** http://files.kolab.org/local/windows-ce/
+*** source/wldap32_0.1-mingw32ce.orig.tar.gz
+*** binary/wldap32-ce-arm-dev_0.1-1_all.deb
+***" >&6;}
+ fi
+fi
+if test "$have_npth" = "no"; then
+ die=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
+***
+*** It is now required to build with support for the
+*** New Portable Threads Library (nPth). Please install this
+*** library first. The library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/npth/
+*** (at least version $NEED_NPTH_VERSION (API $NEED_NPTH_API) is required).
+***" >&5
+$as_echo "$as_me:
+***
+*** It is now required to build with support for the
+*** New Portable Threads Library (nPth). Please install this
+*** library first. The library is for example available at
+*** ftp://ftp.gnupg.org/gcrypt/npth/
+*** (at least version $NEED_NPTH_VERSION (API $NEED_NPTH_API) is required).
+***" >&6;}
+fi
+
+if test "$require_iconv" = yes; then
+ if test "$am_func_iconv" != yes; then
+ die=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
+***
+*** The system does not provide a working iconv function. Please
+*** install a suitable library; for example GNU Libiconv which is
+*** available at:
+*** http://ftp.gnu.org/gnu/libiconv/
+***" >&5
+$as_echo "$as_me:
+***
+*** The system does not provide a working iconv function. Please
+*** install a suitable library; for example GNU Libiconv which is
+*** available at:
+*** http://ftp.gnu.org/gnu/libiconv/
+***" >&6;}
+ fi
+fi
+
+if test "$die" = "yes"; then
+ as_fn_error $? "
+***
+*** Required libraries not found. Please consult the above messages
+*** and install them before running configure again.
+***" "$LINENO" 5
+fi
+
+
+
+ac_config_files="$ac_config_files m4/Makefile Makefile po/Makefile.in common/Makefile common/w32info-rc.h kbx/Makefile g10/Makefile sm/Makefile agent/Makefile scd/Makefile g13/Makefile dirmngr/Makefile tools/gpg-zip tools/Makefile doc/Makefile tests/Makefile tests/openpgp/Makefile tests/pkits/Makefile g10/gpg.w32-manifest"
+
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems. If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
+
+ (set) 2>&1 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
+ sed -n \
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ ;; #(
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+) |
+ sed '
+ /^ac_cv_env_/b end
+ t clear
+ :clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+ am__EXEEXT_TRUE=
+ am__EXEEXT_FALSE='#'
+else
+ am__EXEEXT_TRUE='#'
+ am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GNUPG_AGENT_PGM_TRUE}" && test -z "${GNUPG_AGENT_PGM_FALSE}"; then
+ as_fn_error $? "conditional \"GNUPG_AGENT_PGM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GNUPG_PINENTRY_PGM_TRUE}" && test -z "${GNUPG_PINENTRY_PGM_FALSE}"; then
+ as_fn_error $? "conditional \"GNUPG_PINENTRY_PGM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GNUPG_SCDAEMON_PGM_TRUE}" && test -z "${GNUPG_SCDAEMON_PGM_FALSE}"; then
+ as_fn_error $? "conditional \"GNUPG_SCDAEMON_PGM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GNUPG_DIRMNGR_PGM_TRUE}" && test -z "${GNUPG_DIRMNGR_PGM_FALSE}"; then
+ as_fn_error $? "conditional \"GNUPG_DIRMNGR_PGM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GNUPG_PROTECT_TOOL_PGM_TRUE}" && test -z "${GNUPG_PROTECT_TOOL_PGM_FALSE}"; then
+ as_fn_error $? "conditional \"GNUPG_PROTECT_TOOL_PGM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GNUPG_DIRMNGR_LDAP_PGM_TRUE}" && test -z "${GNUPG_DIRMNGR_LDAP_PGM_FALSE}"; then
+ as_fn_error $? "conditional \"GNUPG_DIRMNGR_LDAP_PGM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_USTAR_TRUE}" && test -z "${HAVE_USTAR_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_USTAR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_DOSISH_SYSTEM_TRUE}" && test -z "${HAVE_DOSISH_SYSTEM_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_DOSISH_SYSTEM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_SIMPLE_GETTEXT_TRUE}" && test -z "${USE_SIMPLE_GETTEXT_FALSE}"; then
+ as_fn_error $? "conditional \"USE_SIMPLE_GETTEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_W32_SYSTEM_TRUE}" && test -z "${HAVE_W32_SYSTEM_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_W32_SYSTEM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_W32CE_SYSTEM_TRUE}" && test -z "${HAVE_W32CE_SYSTEM_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_W32CE_SYSTEM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_ANDROID_SYSTEM_TRUE}" && test -z "${HAVE_ANDROID_SYSTEM_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_ANDROID_SYSTEM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${RUN_TESTS_TRUE}" && test -z "${RUN_TESTS_FALSE}"; then
+ as_fn_error $? "conditional \"RUN_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
++if test -z "${SQLITE3_TRUE}" && test -z "${SQLITE3_FALSE}"; then
++ as_fn_error $? "conditional \"SQLITE3\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+if test -z "${USE_DNS_SRV_TRUE}" && test -z "${USE_DNS_SRV_FALSE}"; then
+ as_fn_error $? "conditional \"USE_DNS_SRV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_LDAP_TRUE}" && test -z "${USE_LDAP_FALSE}"; then
+ as_fn_error $? "conditional \"USE_LDAP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_LDAPWRAPPER_TRUE}" && test -z "${USE_LDAPWRAPPER_FALSE}"; then
+ as_fn_error $? "conditional \"USE_LDAPWRAPPER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DISABLE_REGEX_TRUE}" && test -z "${DISABLE_REGEX_FALSE}"; then
+ as_fn_error $? "conditional \"DISABLE_REGEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_BZIP2_SUPPORT_TRUE}" && test -z "${ENABLE_BZIP2_SUPPORT_FALSE}"; then
+ as_fn_error $? "conditional \"ENABLE_BZIP2_SUPPORT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
+ as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_GPG_TRUE}" && test -z "${BUILD_GPG_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_GPG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_GPGSM_TRUE}" && test -z "${BUILD_GPGSM_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_GPGSM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_AGENT_TRUE}" && test -z "${BUILD_AGENT_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_AGENT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_SCDAEMON_TRUE}" && test -z "${BUILD_SCDAEMON_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_SCDAEMON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_G13_TRUE}" && test -z "${BUILD_G13_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_G13\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_DIRMNGR_TRUE}" && test -z "${BUILD_DIRMNGR_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_DIRMNGR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_TOOLS_TRUE}" && test -z "${BUILD_TOOLS_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_TOOLS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_DOC_TRUE}" && test -z "${BUILD_DOC_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_SYMCRYPTRUN_TRUE}" && test -z "${BUILD_SYMCRYPTRUN_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_SYMCRYPTRUN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_GPGTAR_TRUE}" && test -z "${BUILD_GPGTAR_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_GPGTAR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_CARD_SUPPORT_TRUE}" && test -z "${ENABLE_CARD_SUPPORT_FALSE}"; then
+ as_fn_error $? "conditional \"ENABLE_CARD_SUPPORT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${NO_TRUST_MODELS_TRUE}" && test -z "${NO_TRUST_MODELS_FALSE}"; then
+ as_fn_error $? "conditional \"NO_TRUST_MODELS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
++if test -z "${USE_TOFU_TRUE}" && test -z "${USE_TOFU_FALSE}"; then
++ as_fn_error $? "conditional \"USE_TOFU\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+if test -z "${RUN_GPG_TESTS_TRUE}" && test -z "${RUN_GPG_TESTS_FALSE}"; then
+ as_fn_error $? "conditional \"RUN_GPG_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
+ esac;;
+*)
+ ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
+ fi
+else
+ as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p='mkdir -p "$as_dir"'
+else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
- This file was extended by gnupg $as_me 2.1.9, which was
++This file was extended by gnupg $as_me 2.1.10, which was
+generated by GNU Autoconf 2.69. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+ CONFIG_LINKS = $CONFIG_LINKS
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <http://bugs.gnupg.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
- gnupg config.status 2.1.9
++gnupg config.status 2.1.10
+configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+ case $1 in
+ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+ ac_shift=shift
+ ;;
+ esac
+
+ case $ac_option in
+ # Handling of the options.
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+ --header | --heade | --head | --hea )
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+ as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+ *) as_fn_append ac_config_targets " $1"
+ ac_need_defaults=false ;;
+
+ esac
+ shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+ exec 6>/dev/null
+ ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
+ export CONFIG_SHELL
+ exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+ $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ # from automake < 1.5.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+ "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
+ "common/w32info-rc.h") CONFIG_FILES="$CONFIG_FILES common/w32info-rc.h" ;;
+ "kbx/Makefile") CONFIG_FILES="$CONFIG_FILES kbx/Makefile" ;;
+ "g10/Makefile") CONFIG_FILES="$CONFIG_FILES g10/Makefile" ;;
+ "sm/Makefile") CONFIG_FILES="$CONFIG_FILES sm/Makefile" ;;
+ "agent/Makefile") CONFIG_FILES="$CONFIG_FILES agent/Makefile" ;;
+ "scd/Makefile") CONFIG_FILES="$CONFIG_FILES scd/Makefile" ;;
+ "g13/Makefile") CONFIG_FILES="$CONFIG_FILES g13/Makefile" ;;
+ "dirmngr/Makefile") CONFIG_FILES="$CONFIG_FILES dirmngr/Makefile" ;;
+ "tools/gpg-zip") CONFIG_FILES="$CONFIG_FILES tools/gpg-zip" ;;
+ "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "tests/openpgp/Makefile") CONFIG_FILES="$CONFIG_FILES tests/openpgp/Makefile" ;;
+ "tests/pkits/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pkits/Makefile" ;;
+ "g10/gpg.w32-manifest") CONFIG_FILES="$CONFIG_FILES g10/gpg.w32-manifest" ;;
+
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used. Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience. Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+ tmp= ac_tmp=
+ trap 'exit_status=$?
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+ trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+ test -d "$tmp"
+} ||
+{
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[ ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
+ break
+ elif $ac_last_try; then
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any. Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[ ]*#[ ]*define[ ][ ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ for (key in D) D_is_set[key] = 1
+ FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+ line = \$ 0
+ split(line, arg, " ")
+ if (arg[1] == "#") {
+ defundef = arg[2]
+ mac1 = arg[3]
+ } else {
+ defundef = substr(arg[1], 2)
+ mac1 = arg[2]
+ }
+ split(mac1, mac2, "(") #)
+ macro = mac2[1]
+ prefix = substr(line, 1, index(line, defundef) - 1)
+ if (D_is_set[macro]) {
+ # Preserve the white space surrounding the "#".
+ print prefix "define", macro P[macro] D[macro]
+ next
+ } else {
+ # Replace #undef with comments. This is necessary, for example,
+ # in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ if (defundef == "undef") {
+ print "/*", prefix defundef, macro, "*/"
+ next
+ }
+ }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
+ IFS=$ac_save_IFS
+ shift
+ ac_file=$1
+ shift
+
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
+ ac_file_inputs=
+ for ac_f
+ do
+ case $ac_f in
+ -) ac_f="$ac_tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+ test -f "$ac_f" ||
+ case $ac_f in
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+ done
+
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+ fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+
+ ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ as_dir="$ac_dir"; as_fn_mkdir_p
+ ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
+
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&2;}
+
+ rm -f "$ac_tmp/stdin"
+ case $ac_file in
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
+ if test x"$ac_file" != x-; then
+ {
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+ mv "$ac_tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
+
+
+ case $ac_file$ac_mode in
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Older Autoconf quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named 'Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running 'make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "$am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+ done
+}
+ ;;
+ "po-directories":C)
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ esac
+ # PO directories have a Makefile.in generated from Makefile.in.in.
+ case "$ac_file" in */Makefile.in)
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+ # Treat a directory as a PO directory if and only if it has a
+ # POTFILES.in file. This allows packages to have multiple PO
+ # directories under different names or in different locations.
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+ rm -f "$ac_dir/POTFILES"
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+ POMAKEFILEDEPS="POTFILES.in"
+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+ # on $ac_dir but don't depend on user-specified configuration
+ # parameters.
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ fi
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ done
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
+ esac
+ done ;;
+
+ esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded. So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status. When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+ ac_cs_success=:
+ ac_config_status_args=
+ test "$silent" = yes &&
+ ac_config_status_args="$ac_config_status_args --quiet"
+ exec 5>/dev/null
+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+ $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
+
+echo "
+ GnuPG v${VERSION} has been configured as follows:
+
- Revision: 086b873 (2155)
++ Revision: 9fadfdb (40877)
+ Platform: $PRINTABLE_OS_NAME ($host)
+
+ OpenPGP: $build_gpg
+ S/MIME: $build_gpgsm
+ Agent: $build_agent
+ Smartcard: $build_scdaemon $build_scdaemon_extra
+ G13: $build_g13
+ Dirmngr: $build_dirmngr
+ Gpgtar: $build_gpgtar
+
+ Protect tool: $show_gnupg_protect_tool_pgm
+ LDAP wrapper: $show_gnupg_dirmngr_ldap_pgm
+ Default agent: $show_gnupg_agent_pgm
+ Default pinentry: $show_gnupg_pinentry_pgm
+ Default scdaemon: $show_gnupg_scdaemon_pgm
+ Default dirmngr: $show_gnupg_dirmngr_pgm
+
+ Dirmngr auto start: $dirmngr_auto_start
+ Readline support: $gnupg_cv_have_readline
+ LDAP support: $gnupg_have_ldap
+ DNS SRV support: $use_dns_srv
+ TLS support: $use_tls_library
++ TOFU support: $use_tofu
++ Tor support: $show_tor_support
+"
+if test x"$use_regex" != xyes ; then
+echo "
+ Warning: No regular expression support available.
+ OpenPGP trust signatures won't work.
+ gpg-check-pattern will not be built.
+"
+fi
+if test "x${gpg_config_script_warn}" != x; then
+cat <<G10EOF
+ Warning: Mismatches between the target platform and the
+ to be used libraries have been detected for:
+ ${gpg_config_script_warn}
+ Please check above for more warning messages.
+
+G10EOF
+fi
diff --cc dirmngr/Makefile.in
index bb8f2a7,0000000..d6a13ac
mode 100644,000000..100644
--- a/dirmngr/Makefile.in
+++ b/dirmngr/Makefile.in
@@@ -1,1128 -1,0 +1,1315 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Makefile.am - dirmngr
+# Copyright (C) 2002 Klarälvdalens Datakonsult AB
+# Copyright (C) 2004, 2007, 2010 g10 Code GmbH
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = dirmngr$(EXEEXT) dirmngr-client$(EXEEXT)
+ at USE_LDAPWRAPPER_TRUE@libexec_PROGRAMS = dirmngr_ldap$(EXEEXT)
- noinst_PROGRAMS = $(am__EXEEXT_2)
++noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
+TESTS = $(am__EXEEXT_2)
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS)
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+ at USE_LDAP_TRUE@am__append_8 = ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \
+ at USE_LDAP_TRUE@ ldap-wrapper.h ldap-parse-uri.c ldap-parse-uri.h \
+ at USE_LDAP_TRUE@ ks-engine-ldap.c $(ldap_url) $(extraldap_src)
+
+ at USE_LDAP_TRUE@am__append_9 = $(ldaplibs)
+ at USE_LDAPWRAPPER_FALSE@am__append_10 = $(ldaplibs)
+ at USE_LDAP_TRUE@am__append_11 = t-ldap-parse-uri
+subdir = dirmngr
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"
+ at USE_LDAP_TRUE@am__EXEEXT_1 = t-ldap-parse-uri$(EXEEXT)
- am__EXEEXT_2 = t-dns-cert$(EXEEXT) $(am__EXEEXT_1)
++am__EXEEXT_2 = t-dns-stuff$(EXEEXT) $(am__EXEEXT_1)
++ at MAINTAINER_MODE_TRUE@am__EXEEXT_3 = t-http$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+am__dirmngr_SOURCES_DIST = dirmngr.c dirmngr.h server.c crlcache.c \
+ crlfetch.c certcache.c certcache.h cdb.h cdblib.c misc.c \
- dirmngr-err.h ocsp.c ocsp.h validate.c validate.h dns-cert.c \
- dns-cert.h ks-action.c ks-action.h ks-engine.h ks-engine-hkp.c \
- ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c \
- ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \
- ldap-wrapper.h ldap-parse-uri.c ldap-parse-uri.h \
- ks-engine-ldap.c ldap-url.h ldap-url.c ldap-wrapper-ce.c \
- dirmngr_ldap.c ldap-wrapper.c
++ dirmngr-err.h ocsp.c ocsp.h validate.c validate.h dns-stuff.c \
++ dns-stuff.h http.c http.h ks-action.c ks-action.h ks-engine.h \
++ ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c \
++ ks-engine-kdns.c ldapserver.h ldapserver.c ldap.c \
++ w32-ldap-help.h ldap-wrapper.h ldap-parse-uri.c \
++ ldap-parse-uri.h ks-engine-ldap.c ldap-url.h ldap-url.c \
++ ldap-wrapper-ce.c dirmngr_ldap.c ldap-wrapper.c
+ at HAVE_W32_SYSTEM_TRUE@am__objects_1 = ldap-url.$(OBJEXT)
+ at USE_LDAPWRAPPER_FALSE@am__objects_2 = ldap-wrapper-ce.$(OBJEXT) \
+ at USE_LDAPWRAPPER_FALSE@ dirmngr_ldap.$(OBJEXT)
+ at USE_LDAPWRAPPER_TRUE@am__objects_2 = ldap-wrapper.$(OBJEXT)
+ at USE_LDAP_TRUE@am__objects_3 = ldapserver.$(OBJEXT) ldap.$(OBJEXT) \
+ at USE_LDAP_TRUE@ ldap-parse-uri.$(OBJEXT) \
+ at USE_LDAP_TRUE@ ks-engine-ldap.$(OBJEXT) $(am__objects_1) \
+ at USE_LDAP_TRUE@ $(am__objects_2)
+am_dirmngr_OBJECTS = dirmngr.$(OBJEXT) server.$(OBJEXT) \
+ crlcache.$(OBJEXT) crlfetch.$(OBJEXT) certcache.$(OBJEXT) \
+ cdblib.$(OBJEXT) misc.$(OBJEXT) ocsp.$(OBJEXT) \
- validate.$(OBJEXT) dns-cert.$(OBJEXT) ks-action.$(OBJEXT) \
- ks-engine-hkp.$(OBJEXT) ks-engine-http.$(OBJEXT) \
- ks-engine-finger.$(OBJEXT) ks-engine-kdns.$(OBJEXT) \
- $(am__objects_3)
++ validate.$(OBJEXT) dns-stuff.$(OBJEXT) http.$(OBJEXT) \
++ ks-action.$(OBJEXT) ks-engine-hkp.$(OBJEXT) \
++ ks-engine-http.$(OBJEXT) ks-engine-finger.$(OBJEXT) \
++ ks-engine-kdns.$(OBJEXT) $(am__objects_3)
+dirmngr_OBJECTS = $(am_dirmngr_OBJECTS)
+am__DEPENDENCIES_1 =
+ at USE_LDAP_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ at USE_LDAP_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
+ at USE_LDAPWRAPPER_FALSE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2)
- dirmngr_DEPENDENCIES = $(libcommontlsnpth) $(libcommonpth) \
++dirmngr_DEPENDENCIES = $(libcommonpth) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
- $(am__DEPENDENCIES_4)
++ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4)
+dirmngr_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dirmngr_LDFLAGS) \
+ $(LDFLAGS) -o $@
+am_dirmngr_client_OBJECTS = dirmngr-client.$(OBJEXT)
+dirmngr_client_OBJECTS = $(am_dirmngr_client_OBJECTS)
+dirmngr_client_DEPENDENCIES = $(libcommon) no-libgcrypt.o \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+dirmngr_client_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(dirmngr_client_LDFLAGS) $(LDFLAGS) -o $@
+am__dirmngr_ldap_SOURCES_DIST = dirmngr_ldap.c ldap-url.h ldap-url.c
+ at HAVE_W32_SYSTEM_TRUE@am__objects_4 = dirmngr_ldap-ldap-url.$(OBJEXT)
+ at USE_LDAPWRAPPER_TRUE@am_dirmngr_ldap_OBJECTS = \
+ at USE_LDAPWRAPPER_TRUE@ dirmngr_ldap-dirmngr_ldap.$(OBJEXT) \
+ at USE_LDAPWRAPPER_TRUE@ $(am__objects_4)
+dirmngr_ldap_OBJECTS = $(am_dirmngr_ldap_OBJECTS)
+ at USE_LDAPWRAPPER_TRUE@dirmngr_ldap_DEPENDENCIES = $(libcommon) \
+ at USE_LDAPWRAPPER_TRUE@ no-libgcrypt.o $(am__DEPENDENCIES_1) \
+ at USE_LDAPWRAPPER_TRUE@ $(am__DEPENDENCIES_1) \
+ at USE_LDAPWRAPPER_TRUE@ $(am__DEPENDENCIES_1) \
+ at USE_LDAPWRAPPER_TRUE@ $(am__DEPENDENCIES_1) \
+ at USE_LDAPWRAPPER_TRUE@ $(am__DEPENDENCIES_1)
+dirmngr_ldap_LINK = $(CCLD) $(dirmngr_ldap_CFLAGS) $(CFLAGS) \
+ $(dirmngr_ldap_LDFLAGS) $(LDFLAGS) -o $@
- am_t_dns_cert_OBJECTS = t-dns-cert.$(OBJEXT) dns-cert.$(OBJEXT)
- t_dns_cert_OBJECTS = $(am_t_dns_cert_OBJECTS)
- am__DEPENDENCIES_5 = $(libcommontls) $(libcommon) no-libgcrypt.o \
++am_t_dns_stuff_OBJECTS = t_dns_stuff-t-dns-stuff.$(OBJEXT) \
++ t_dns_stuff-dns-stuff.$(OBJEXT)
++t_dns_stuff_OBJECTS = $(am_t_dns_stuff_OBJECTS)
++am__DEPENDENCIES_5 = $(libcommon) no-libgcrypt.o $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
- t_dns_cert_DEPENDENCIES = $(am__DEPENDENCIES_5)
++t_dns_stuff_DEPENDENCIES = $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_1)
++t_dns_stuff_LINK = $(CCLD) $(t_dns_stuff_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++am_t_http_OBJECTS = t_http-t-http.$(OBJEXT) t_http-http.$(OBJEXT) \
++ t_http-dns-stuff.$(OBJEXT)
++t_http_OBJECTS = $(am_t_http_OBJECTS)
++t_http_DEPENDENCIES = $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++t_http_LINK = $(CCLD) $(t_http_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+am__t_ldap_parse_uri_SOURCES_DIST = t-ldap-parse-uri.c \
- ldap-parse-uri.c ldap-parse-uri.h ldap-url.h ldap-url.c \
- t-support.h
- am__objects_5 =
- am_t_ldap_parse_uri_OBJECTS = t-ldap-parse-uri.$(OBJEXT) \
- ldap-parse-uri.$(OBJEXT) $(am__objects_1) $(am__objects_5)
++ ldap-parse-uri.c ldap-parse-uri.h http.c dns-stuff.c \
++ ldap-url.h ldap-url.c t-support.h
++ at HAVE_W32_SYSTEM_TRUE@am__objects_5 = \
++ at HAVE_W32_SYSTEM_TRUE@ t_ldap_parse_uri-ldap-url.$(OBJEXT)
++am__objects_6 =
++am_t_ldap_parse_uri_OBJECTS = \
++ t_ldap_parse_uri-t-ldap-parse-uri.$(OBJEXT) \
++ t_ldap_parse_uri-ldap-parse-uri.$(OBJEXT) \
++ t_ldap_parse_uri-http.$(OBJEXT) \
++ t_ldap_parse_uri-dns-stuff.$(OBJEXT) $(am__objects_5) \
++ $(am__objects_6)
+t_ldap_parse_uri_OBJECTS = $(am_t_ldap_parse_uri_OBJECTS)
+t_ldap_parse_uri_DEPENDENCIES = $(am__DEPENDENCIES_2) \
- $(am__DEPENDENCIES_5)
++ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_1)
++t_ldap_parse_uri_LINK = $(CCLD) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(dirmngr_SOURCES) $(dirmngr_client_SOURCES) \
- $(dirmngr_ldap_SOURCES) $(t_dns_cert_SOURCES) \
- $(t_ldap_parse_uri_SOURCES)
++ $(dirmngr_ldap_SOURCES) $(t_dns_stuff_SOURCES) \
++ $(t_http_SOURCES) $(t_ldap_parse_uri_SOURCES)
+DIST_SOURCES = $(am__dirmngr_SOURCES_DIST) $(dirmngr_client_SOURCES) \
- $(am__dirmngr_ldap_SOURCES_DIST) $(t_dns_cert_SOURCES) \
- $(am__t_ldap_parse_uri_SOURCES_DIST)
++ $(am__dirmngr_ldap_SOURCES_DIST) $(t_dns_stuff_SOURCES) \
++ $(t_http_SOURCES) $(am__t_ldap_parse_uri_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011
++EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
+ $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4) $(am__append_5) $(am__append_6) \
+ $(am__append_7)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs =
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) \
+ $(GPG_ERROR_CFLAGS) $(NPTH_CFLAGS) $(NTBTLS_CFLAGS) \
+ $(LIBGNUTLS_CFLAGS)
+
+BUILT_SOURCES = no-libgcrypt.c
+CLEANFILES = no-libgcrypt.c
+ at HAVE_W32_SYSTEM_FALSE@ldap_url =
+ at HAVE_W32_SYSTEM_TRUE@ldap_url = ldap-url.h ldap-url.c
+ at USE_LDAPWRAPPER_FALSE@extraldap_src = ldap-wrapper-ce.c dirmngr_ldap.c
+ at USE_LDAPWRAPPER_TRUE@extraldap_src = ldap-wrapper.c
+noinst_HEADERS = dirmngr.h crlcache.h crlfetch.h misc.h
+dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \
+ certcache.c certcache.h cdb.h cdblib.c misc.c dirmngr-err.h \
- ocsp.c ocsp.h validate.c validate.h dns-cert.c dns-cert.h \
- ks-action.c ks-action.h ks-engine.h ks-engine-hkp.c \
- ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c \
- $(am__append_8)
++ ocsp.c ocsp.h validate.c validate.h dns-stuff.c dns-stuff.h \
++ http.c http.h ks-action.c ks-action.h ks-engine.h \
++ ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c \
++ ks-engine-kdns.c $(am__append_8)
+ at USE_LDAP_FALSE@ldaplibs =
+ at USE_LDAP_TRUE@ldaplibs = $(LDAPLIBS)
- dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) $(DNSLIBS) \
- $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \
- $(am__append_9) $(am__append_10)
++dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN_LIBS) \
++ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) \
++ $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(am__append_9) \
++ $(am__append_10)
+dirmngr_LDFLAGS = $(extra_bin_ldflags)
+ at USE_LDAPWRAPPER_TRUE@dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url)
+ at USE_LDAPWRAPPER_TRUE@dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
+ at USE_LDAPWRAPPER_TRUE@dirmngr_ldap_LDFLAGS =
+ at USE_LDAPWRAPPER_TRUE@dirmngr_ldap_LDADD = $(libcommon) no-libgcrypt.o \
+ at USE_LDAPWRAPPER_TRUE@ $(GPG_ERROR_LIBS) $(LDAPLIBS) $(LBER_LIBS) $(LIBINTL) \
+ at USE_LDAPWRAPPER_TRUE@ $(LIBICONV)
+
+dirmngr_client_SOURCES = dirmngr-client.c
+dirmngr_client_LDADD = $(libcommon) no-libgcrypt.o \
+ $(LIBASSUAN_LIBS) \
+ $(GPG_ERROR_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV)
+
+dirmngr_client_LDFLAGS = $(extra_bin_ldflags)
+t_common_src = t-support.h
- # We need libcommontls, because we use the http functions.
- t_common_ldadd = $(libcommontls) $(libcommon) no-libgcrypt.o \
++t_common_ldadd = $(libcommon) no-libgcrypt.o $(LIBASSUAN_LIBS) \
+ $(GPG_ERROR_LIBS) $(NETLIBS) \
+ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
+ $(DNSLIBS) $(LIBINTL) $(LIBICONV)
+
- module_tests = t-dns-cert $(am__append_11)
++module_tests = t-dns-stuff $(am__append_11)
++ at MAINTAINER_MODE_FALSE@module_maint_tests =
++ at MAINTAINER_MODE_TRUE@module_maint_tests = t-http
++
++# http tests
++t_http_SOURCES = t-http.c http.c dns-stuff.c
++t_http_CFLAGS = -DWITHOUT_NPTH=1 \
++ $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS) \
++ $(GPG_ERROR_CFLAGS)
++
++t_http_LDADD = $(t_common_ldadd) \
++ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS)
++
+t_ldap_parse_uri_SOURCES = \
+ t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
++ http.c dns-stuff.c \
+ $(ldap_url) $(t_common_src)
+
- t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd)
- t_dns_cert_SOURCES = t-dns-cert.c dns-cert.c
- t_dns_cert_LDADD = $(t_common_ldadd)
++t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1
++t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
++t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1
++t_dns_stuff_SOURCES = t-dns-stuff.c dns-stuff.c
++t_dns_stuff_LDADD = $(t_common_ldadd) $(DNSLIBS)
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dirmngr/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu dirmngr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-libexecPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+
+clean-libexecPROGRAMS:
+ -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+
+clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+dirmngr$(EXEEXT): $(dirmngr_OBJECTS) $(dirmngr_DEPENDENCIES) $(EXTRA_dirmngr_DEPENDENCIES)
+ @rm -f dirmngr$(EXEEXT)
+ $(AM_V_CCLD)$(dirmngr_LINK) $(dirmngr_OBJECTS) $(dirmngr_LDADD) $(LIBS)
+
+dirmngr-client$(EXEEXT): $(dirmngr_client_OBJECTS) $(dirmngr_client_DEPENDENCIES) $(EXTRA_dirmngr_client_DEPENDENCIES)
+ @rm -f dirmngr-client$(EXEEXT)
+ $(AM_V_CCLD)$(dirmngr_client_LINK) $(dirmngr_client_OBJECTS) $(dirmngr_client_LDADD) $(LIBS)
+
+dirmngr_ldap$(EXEEXT): $(dirmngr_ldap_OBJECTS) $(dirmngr_ldap_DEPENDENCIES) $(EXTRA_dirmngr_ldap_DEPENDENCIES)
+ @rm -f dirmngr_ldap$(EXEEXT)
+ $(AM_V_CCLD)$(dirmngr_ldap_LINK) $(dirmngr_ldap_OBJECTS) $(dirmngr_ldap_LDADD) $(LIBS)
+
- t-dns-cert$(EXEEXT): $(t_dns_cert_OBJECTS) $(t_dns_cert_DEPENDENCIES) $(EXTRA_t_dns_cert_DEPENDENCIES)
- @rm -f t-dns-cert$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(t_dns_cert_OBJECTS) $(t_dns_cert_LDADD) $(LIBS)
++t-dns-stuff$(EXEEXT): $(t_dns_stuff_OBJECTS) $(t_dns_stuff_DEPENDENCIES) $(EXTRA_t_dns_stuff_DEPENDENCIES)
++ @rm -f t-dns-stuff$(EXEEXT)
++ $(AM_V_CCLD)$(t_dns_stuff_LINK) $(t_dns_stuff_OBJECTS) $(t_dns_stuff_LDADD) $(LIBS)
++
++t-http$(EXEEXT): $(t_http_OBJECTS) $(t_http_DEPENDENCIES) $(EXTRA_t_http_DEPENDENCIES)
++ @rm -f t-http$(EXEEXT)
++ $(AM_V_CCLD)$(t_http_LINK) $(t_http_OBJECTS) $(t_http_LDADD) $(LIBS)
+
+t-ldap-parse-uri$(EXEEXT): $(t_ldap_parse_uri_OBJECTS) $(t_ldap_parse_uri_DEPENDENCIES) $(EXTRA_t_ldap_parse_uri_DEPENDENCIES)
+ @rm -f t-ldap-parse-uri$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(t_ldap_parse_uri_OBJECTS) $(t_ldap_parse_uri_LDADD) $(LIBS)
++ $(AM_V_CCLD)$(t_ldap_parse_uri_LINK) $(t_ldap_parse_uri_OBJECTS) $(t_ldap_parse_uri_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cdblib.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/certcache.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/crlcache.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/crlfetch.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dirmngr-client.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dirmngr.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dirmngr_ldap-ldap-url.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dirmngr_ldap.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dns-cert.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dns-stuff.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/http.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ks-action.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ks-engine-finger.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ks-engine-hkp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ks-engine-http.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ks-engine-kdns.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ks-engine-ldap.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ldap-parse-uri.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ldap-url.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ldap-wrapper-ce.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ldap-wrapper.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ldap.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ldapserver.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/misc.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ocsp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-dns-cert.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-ldap-parse-uri.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_dns_stuff-dns-stuff.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_dns_stuff-t-dns-stuff.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_http-dns-stuff.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_http-http.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_http-t-http.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_ldap_parse_uri-dns-stuff.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_ldap_parse_uri-http.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_ldap_parse_uri-ldap-url.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/validate.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+dirmngr_ldap-dirmngr_ldap.o: dirmngr_ldap.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -MT dirmngr_ldap-dirmngr_ldap.o -MD -MP -MF $(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Tpo -c -o dirmngr_ldap-dirmngr_ldap.o `test -f 'dirmngr_ldap.c' || echo '$(srcdir)/'`dirmngr_ldap.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Tpo $(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dirmngr_ldap.c' object='dirmngr_ldap-dirmngr_ldap.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -c -o dirmngr_ldap-dirmngr_ldap.o `test -f 'dirmngr_ldap.c' || echo '$(srcdir)/'`dirmngr_ldap.c
+
+dirmngr_ldap-dirmngr_ldap.obj: dirmngr_ldap.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -MT dirmngr_ldap-dirmngr_ldap.obj -MD -MP -MF $(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Tpo -c -o dirmngr_ldap-dirmngr_ldap.obj `if test -f 'dirmngr_ldap.c'; then $(CYGPATH_W) 'dirmngr_ldap.c'; else $(CYGPATH_W) '$(srcdir)/dirmngr_ldap.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Tpo $(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dirmngr_ldap.c' object='dirmngr_ldap-dirmngr_ldap.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -c -o dirmngr_ldap-dirmngr_ldap.obj `if test -f 'dirmngr_ldap.c'; then $(CYGPATH_W) 'dirmngr_ldap.c'; else $(CYGPATH_W) '$(srcdir)/dirmngr_ldap.c'; fi`
+
+dirmngr_ldap-ldap-url.o: ldap-url.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -MT dirmngr_ldap-ldap-url.o -MD -MP -MF $(DEPDIR)/dirmngr_ldap-ldap-url.Tpo -c -o dirmngr_ldap-ldap-url.o `test -f 'ldap-url.c' || echo '$(srcdir)/'`ldap-url.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dirmngr_ldap-ldap-url.Tpo $(DEPDIR)/dirmngr_ldap-ldap-url.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldap-url.c' object='dirmngr_ldap-ldap-url.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -c -o dirmngr_ldap-ldap-url.o `test -f 'ldap-url.c' || echo '$(srcdir)/'`ldap-url.c
+
+dirmngr_ldap-ldap-url.obj: ldap-url.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -MT dirmngr_ldap-ldap-url.obj -MD -MP -MF $(DEPDIR)/dirmngr_ldap-ldap-url.Tpo -c -o dirmngr_ldap-ldap-url.obj `if test -f 'ldap-url.c'; then $(CYGPATH_W) 'ldap-url.c'; else $(CYGPATH_W) '$(srcdir)/ldap-url.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dirmngr_ldap-ldap-url.Tpo $(DEPDIR)/dirmngr_ldap-ldap-url.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldap-url.c' object='dirmngr_ldap-ldap-url.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -c -o dirmngr_ldap-ldap-url.obj `if test -f 'ldap-url.c'; then $(CYGPATH_W) 'ldap-url.c'; else $(CYGPATH_W) '$(srcdir)/ldap-url.c'; fi`
+
++t_dns_stuff-t-dns-stuff.o: t-dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_dns_stuff_CFLAGS) $(CFLAGS) -MT t_dns_stuff-t-dns-stuff.o -MD -MP -MF $(DEPDIR)/t_dns_stuff-t-dns-stuff.Tpo -c -o t_dns_stuff-t-dns-stuff.o `test -f 't-dns-stuff.c' || echo '$(srcdir)/'`t-dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_dns_stuff-t-dns-stuff.Tpo $(DEPDIR)/t_dns_stuff-t-dns-stuff.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t-dns-stuff.c' object='t_dns_stuff-t-dns-stuff.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_dns_stuff_CFLAGS) $(CFLAGS) -c -o t_dns_stuff-t-dns-stuff.o `test -f 't-dns-stuff.c' || echo '$(srcdir)/'`t-dns-stuff.c
++
++t_dns_stuff-t-dns-stuff.obj: t-dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_dns_stuff_CFLAGS) $(CFLAGS) -MT t_dns_stuff-t-dns-stuff.obj -MD -MP -MF $(DEPDIR)/t_dns_stuff-t-dns-stuff.Tpo -c -o t_dns_stuff-t-dns-stuff.obj `if test -f 't-dns-stuff.c'; then $(CYGPATH_W) 't-dns-stuff.c'; else $(CYGPATH_W) '$(srcdir)/t-dns-stuff.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_dns_stuff-t-dns-stuff.Tpo $(DEPDIR)/t_dns_stuff-t-dns-stuff.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t-dns-stuff.c' object='t_dns_stuff-t-dns-stuff.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_dns_stuff_CFLAGS) $(CFLAGS) -c -o t_dns_stuff-t-dns-stuff.obj `if test -f 't-dns-stuff.c'; then $(CYGPATH_W) 't-dns-stuff.c'; else $(CYGPATH_W) '$(srcdir)/t-dns-stuff.c'; fi`
++
++t_dns_stuff-dns-stuff.o: dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_dns_stuff_CFLAGS) $(CFLAGS) -MT t_dns_stuff-dns-stuff.o -MD -MP -MF $(DEPDIR)/t_dns_stuff-dns-stuff.Tpo -c -o t_dns_stuff-dns-stuff.o `test -f 'dns-stuff.c' || echo '$(srcdir)/'`dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_dns_stuff-dns-stuff.Tpo $(DEPDIR)/t_dns_stuff-dns-stuff.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dns-stuff.c' object='t_dns_stuff-dns-stuff.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_dns_stuff_CFLAGS) $(CFLAGS) -c -o t_dns_stuff-dns-stuff.o `test -f 'dns-stuff.c' || echo '$(srcdir)/'`dns-stuff.c
++
++t_dns_stuff-dns-stuff.obj: dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_dns_stuff_CFLAGS) $(CFLAGS) -MT t_dns_stuff-dns-stuff.obj -MD -MP -MF $(DEPDIR)/t_dns_stuff-dns-stuff.Tpo -c -o t_dns_stuff-dns-stuff.obj `if test -f 'dns-stuff.c'; then $(CYGPATH_W) 'dns-stuff.c'; else $(CYGPATH_W) '$(srcdir)/dns-stuff.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_dns_stuff-dns-stuff.Tpo $(DEPDIR)/t_dns_stuff-dns-stuff.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dns-stuff.c' object='t_dns_stuff-dns-stuff.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_dns_stuff_CFLAGS) $(CFLAGS) -c -o t_dns_stuff-dns-stuff.obj `if test -f 'dns-stuff.c'; then $(CYGPATH_W) 'dns-stuff.c'; else $(CYGPATH_W) '$(srcdir)/dns-stuff.c'; fi`
++
++t_http-t-http.o: t-http.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -MT t_http-t-http.o -MD -MP -MF $(DEPDIR)/t_http-t-http.Tpo -c -o t_http-t-http.o `test -f 't-http.c' || echo '$(srcdir)/'`t-http.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_http-t-http.Tpo $(DEPDIR)/t_http-t-http.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t-http.c' object='t_http-t-http.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -c -o t_http-t-http.o `test -f 't-http.c' || echo '$(srcdir)/'`t-http.c
++
++t_http-t-http.obj: t-http.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -MT t_http-t-http.obj -MD -MP -MF $(DEPDIR)/t_http-t-http.Tpo -c -o t_http-t-http.obj `if test -f 't-http.c'; then $(CYGPATH_W) 't-http.c'; else $(CYGPATH_W) '$(srcdir)/t-http.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_http-t-http.Tpo $(DEPDIR)/t_http-t-http.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t-http.c' object='t_http-t-http.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -c -o t_http-t-http.obj `if test -f 't-http.c'; then $(CYGPATH_W) 't-http.c'; else $(CYGPATH_W) '$(srcdir)/t-http.c'; fi`
++
++t_http-http.o: http.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -MT t_http-http.o -MD -MP -MF $(DEPDIR)/t_http-http.Tpo -c -o t_http-http.o `test -f 'http.c' || echo '$(srcdir)/'`http.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_http-http.Tpo $(DEPDIR)/t_http-http.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='http.c' object='t_http-http.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -c -o t_http-http.o `test -f 'http.c' || echo '$(srcdir)/'`http.c
++
++t_http-http.obj: http.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -MT t_http-http.obj -MD -MP -MF $(DEPDIR)/t_http-http.Tpo -c -o t_http-http.obj `if test -f 'http.c'; then $(CYGPATH_W) 'http.c'; else $(CYGPATH_W) '$(srcdir)/http.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_http-http.Tpo $(DEPDIR)/t_http-http.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='http.c' object='t_http-http.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -c -o t_http-http.obj `if test -f 'http.c'; then $(CYGPATH_W) 'http.c'; else $(CYGPATH_W) '$(srcdir)/http.c'; fi`
++
++t_http-dns-stuff.o: dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -MT t_http-dns-stuff.o -MD -MP -MF $(DEPDIR)/t_http-dns-stuff.Tpo -c -o t_http-dns-stuff.o `test -f 'dns-stuff.c' || echo '$(srcdir)/'`dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_http-dns-stuff.Tpo $(DEPDIR)/t_http-dns-stuff.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dns-stuff.c' object='t_http-dns-stuff.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -c -o t_http-dns-stuff.o `test -f 'dns-stuff.c' || echo '$(srcdir)/'`dns-stuff.c
++
++t_http-dns-stuff.obj: dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -MT t_http-dns-stuff.obj -MD -MP -MF $(DEPDIR)/t_http-dns-stuff.Tpo -c -o t_http-dns-stuff.obj `if test -f 'dns-stuff.c'; then $(CYGPATH_W) 'dns-stuff.c'; else $(CYGPATH_W) '$(srcdir)/dns-stuff.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_http-dns-stuff.Tpo $(DEPDIR)/t_http-dns-stuff.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dns-stuff.c' object='t_http-dns-stuff.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_CFLAGS) $(CFLAGS) -c -o t_http-dns-stuff.obj `if test -f 'dns-stuff.c'; then $(CYGPATH_W) 'dns-stuff.c'; else $(CYGPATH_W) '$(srcdir)/dns-stuff.c'; fi`
++
++t_ldap_parse_uri-t-ldap-parse-uri.o: t-ldap-parse-uri.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-t-ldap-parse-uri.o -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Tpo -c -o t_ldap_parse_uri-t-ldap-parse-uri.o `test -f 't-ldap-parse-uri.c' || echo '$(srcdir)/'`t-ldap-parse-uri.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Tpo $(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t-ldap-parse-uri.c' object='t_ldap_parse_uri-t-ldap-parse-uri.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-t-ldap-parse-uri.o `test -f 't-ldap-parse-uri.c' || echo '$(srcdir)/'`t-ldap-parse-uri.c
++
++t_ldap_parse_uri-t-ldap-parse-uri.obj: t-ldap-parse-uri.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-t-ldap-parse-uri.obj -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Tpo -c -o t_ldap_parse_uri-t-ldap-parse-uri.obj `if test -f 't-ldap-parse-uri.c'; then $(CYGPATH_W) 't-ldap-parse-uri.c'; else $(CYGPATH_W) '$(srcdir)/t-ldap-parse-uri.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Tpo $(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t-ldap-parse-uri.c' object='t_ldap_parse_uri-t-ldap-parse-uri.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-t-ldap-parse-uri.obj `if test -f 't-ldap-parse-uri.c'; then $(CYGPATH_W) 't-ldap-parse-uri.c'; else $(CYGPATH_W) '$(srcdir)/t-ldap-parse-uri.c'; fi`
++
++t_ldap_parse_uri-ldap-parse-uri.o: ldap-parse-uri.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-ldap-parse-uri.o -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Tpo -c -o t_ldap_parse_uri-ldap-parse-uri.o `test -f 'ldap-parse-uri.c' || echo '$(srcdir)/'`ldap-parse-uri.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Tpo $(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldap-parse-uri.c' object='t_ldap_parse_uri-ldap-parse-uri.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-ldap-parse-uri.o `test -f 'ldap-parse-uri.c' || echo '$(srcdir)/'`ldap-parse-uri.c
++
++t_ldap_parse_uri-ldap-parse-uri.obj: ldap-parse-uri.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-ldap-parse-uri.obj -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Tpo -c -o t_ldap_parse_uri-ldap-parse-uri.obj `if test -f 'ldap-parse-uri.c'; then $(CYGPATH_W) 'ldap-parse-uri.c'; else $(CYGPATH_W) '$(srcdir)/ldap-parse-uri.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Tpo $(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldap-parse-uri.c' object='t_ldap_parse_uri-ldap-parse-uri.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-ldap-parse-uri.obj `if test -f 'ldap-parse-uri.c'; then $(CYGPATH_W) 'ldap-parse-uri.c'; else $(CYGPATH_W) '$(srcdir)/ldap-parse-uri.c'; fi`
++
++t_ldap_parse_uri-http.o: http.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-http.o -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-http.Tpo -c -o t_ldap_parse_uri-http.o `test -f 'http.c' || echo '$(srcdir)/'`http.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-http.Tpo $(DEPDIR)/t_ldap_parse_uri-http.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='http.c' object='t_ldap_parse_uri-http.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-http.o `test -f 'http.c' || echo '$(srcdir)/'`http.c
++
++t_ldap_parse_uri-http.obj: http.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-http.obj -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-http.Tpo -c -o t_ldap_parse_uri-http.obj `if test -f 'http.c'; then $(CYGPATH_W) 'http.c'; else $(CYGPATH_W) '$(srcdir)/http.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-http.Tpo $(DEPDIR)/t_ldap_parse_uri-http.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='http.c' object='t_ldap_parse_uri-http.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-http.obj `if test -f 'http.c'; then $(CYGPATH_W) 'http.c'; else $(CYGPATH_W) '$(srcdir)/http.c'; fi`
++
++t_ldap_parse_uri-dns-stuff.o: dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-dns-stuff.o -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-dns-stuff.Tpo -c -o t_ldap_parse_uri-dns-stuff.o `test -f 'dns-stuff.c' || echo '$(srcdir)/'`dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-dns-stuff.Tpo $(DEPDIR)/t_ldap_parse_uri-dns-stuff.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dns-stuff.c' object='t_ldap_parse_uri-dns-stuff.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-dns-stuff.o `test -f 'dns-stuff.c' || echo '$(srcdir)/'`dns-stuff.c
++
++t_ldap_parse_uri-dns-stuff.obj: dns-stuff.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-dns-stuff.obj -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-dns-stuff.Tpo -c -o t_ldap_parse_uri-dns-stuff.obj `if test -f 'dns-stuff.c'; then $(CYGPATH_W) 'dns-stuff.c'; else $(CYGPATH_W) '$(srcdir)/dns-stuff.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-dns-stuff.Tpo $(DEPDIR)/t_ldap_parse_uri-dns-stuff.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dns-stuff.c' object='t_ldap_parse_uri-dns-stuff.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-dns-stuff.obj `if test -f 'dns-stuff.c'; then $(CYGPATH_W) 'dns-stuff.c'; else $(CYGPATH_W) '$(srcdir)/dns-stuff.c'; fi`
++
++t_ldap_parse_uri-ldap-url.o: ldap-url.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-ldap-url.o -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-ldap-url.Tpo -c -o t_ldap_parse_uri-ldap-url.o `test -f 'ldap-url.c' || echo '$(srcdir)/'`ldap-url.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-ldap-url.Tpo $(DEPDIR)/t_ldap_parse_uri-ldap-url.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldap-url.c' object='t_ldap_parse_uri-ldap-url.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-ldap-url.o `test -f 'ldap-url.c' || echo '$(srcdir)/'`ldap-url.c
++
++t_ldap_parse_uri-ldap-url.obj: ldap-url.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-ldap-url.obj -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-ldap-url.Tpo -c -o t_ldap_parse_uri-ldap-url.obj `if test -f 'ldap-url.c'; then $(CYGPATH_W) 'ldap-url.c'; else $(CYGPATH_W) '$(srcdir)/ldap-url.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-ldap-url.Tpo $(DEPDIR)/t_ldap_parse_uri-ldap-url.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldap-url.c' object='t_ldap_parse_uri-ldap-url.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-ldap-url.obj `if test -f 'ldap-url.c'; then $(CYGPATH_W) 'ldap-url.c'; else $(CYGPATH_W) '$(srcdir)/ldap-url.c'; fi`
++
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ col=$$blu; res=SKIP; \
+ fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
+ All=""; \
+ else \
+ tests="tests"; \
+ All="All "; \
+ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="$$All$$all $$tests passed"; \
+ else \
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all $$tests failed"; \
+ else \
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS
+
+.MAKE: all check check-am install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+ clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-libexecPROGRAMS
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+no-libgcrypt.c : $(top_srcdir)/tools/no-libgcrypt.c
+ cat $(top_srcdir)/tools/no-libgcrypt.c > no-libgcrypt.c
+
- $(PROGRAMS) : $(libcommon) $(libcommonpth) $(libcommontls) $(libcommontlsnpth)
++$(PROGRAMS) : $(libcommon) $(libcommonpth)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc doc/Makefile.in
index b0381e2,0000000..81ae3c8
mode 100644,000000..100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@@ -1,1202 -1,0 +1,1208 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(gnupg_TEXINFOS) $(top_srcdir)/build-aux/texinfo.tex \
+ $(dist_pkgdata_DATA) $(nobase_dist_doc_DATA)
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+subdir = doc
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+SOURCES =
+DIST_SOURCES =
+AM_V_DVIPS = $(am__v_DVIPS_ at AM_V@)
+am__v_DVIPS_ = $(am__v_DVIPS_ at AM_DEFAULT_V@)
+am__v_DVIPS_0 = @echo " DVIPS " $@;
+am__v_DVIPS_1 =
+AM_V_MAKEINFO = $(am__v_MAKEINFO_ at AM_V@)
+am__v_MAKEINFO_ = $(am__v_MAKEINFO_ at AM_DEFAULT_V@)
+am__v_MAKEINFO_0 = @echo " MAKEINFO" $@;
+am__v_MAKEINFO_1 =
+AM_V_INFOHTML = $(am__v_INFOHTML_ at AM_V@)
+am__v_INFOHTML_ = $(am__v_INFOHTML_ at AM_DEFAULT_V@)
+am__v_INFOHTML_0 = @echo " INFOHTML" $@;
+am__v_INFOHTML_1 =
+AM_V_TEXI2DVI = $(am__v_TEXI2DVI_ at AM_V@)
+am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_ at AM_DEFAULT_V@)
+am__v_TEXI2DVI_0 = @echo " TEXI2DVI" $@;
+am__v_TEXI2DVI_1 =
+AM_V_TEXI2PDF = $(am__v_TEXI2PDF_ at AM_V@)
+am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_ at AM_DEFAULT_V@)
+am__v_TEXI2PDF_0 = @echo " TEXI2PDF" $@;
+am__v_TEXI2PDF_1 =
+AM_V_texinfo = $(am__v_texinfo_ at AM_V@)
+am__v_texinfo_ = $(am__v_texinfo_ at AM_DEFAULT_V@)
+am__v_texinfo_0 = -q
+am__v_texinfo_1 =
+AM_V_texidevnull = $(am__v_texidevnull_ at AM_V@)
+am__v_texidevnull_ = $(am__v_texidevnull_ at AM_DEFAULT_V@)
+am__v_texidevnull_0 = > /dev/null
+am__v_texidevnull_1 =
+INFO_DEPS = $(srcdir)/gnupg.info
+TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
+am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
+DVIS = gnupg.dvi
+PDFS = gnupg.pdf
+PSS = gnupg.ps
+HTMLS = gnupg.html
+TEXINFOS = gnupg.texi
+TEXI2DVI = texi2dvi
+TEXI2PDF = $(TEXI2DVI) --pdf --batch
+MAKEINFOHTML = $(MAKEINFO) --html
+AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" \
+ "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(docdir)"
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+man1dir = $(mandir)/man1
+man7dir = $(mandir)/man7
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+DATA = $(dist_pkgdata_DATA) $(nobase_dist_doc_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(am__append_1) \
+ $(am__append_2) $(am__append_3) $(am__append_4) \
+ $(am__append_5) $(am__append_6) $(am__append_7)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs =
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+examples = examples/README examples/scd-event examples/trustlist.txt \
+ examples/gpgconf.conf examples/pwpattern.list
+
+helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
+ help.da.txt help.de.txt help.el.txt help.eo.txt \
+ help.es.txt help.et.txt help.fi.txt help.fr.txt \
+ help.gl.txt help.hu.txt help.id.txt help.it.txt \
+ help.ja.txt help.nb.txt help.pl.txt help.pt.txt \
+ help.pt_BR.txt help.ro.txt help.ru.txt help.sk.txt \
+ help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
+
+EXTRA_DIST = samplekeys.asc mksamplekeys \
+ gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png\
+ gnupg-card-architecture.eps gnupg-card-architecture.png \
+ gnupg-card-architecture.pdf \
+ FAQ gnupg7.texi mkdefsinc.c defsincdate \
+ opt-homedir.texi see-also-note.texi specify-user-id.texi \
+ gpgv.texi yat2m.c ChangeLog-2011 whats-new-in-2.1.txt
+
+BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
+ gnupg-card-architecture.pdf defsincdate defs.inc
+
+info_TEXINFOS = gnupg.texi
+dist_pkgdata_DATA = qualified.txt com-certs.pem $(helpfiles)
+nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO TRANSLATE OpenPGP KEYSERVER \
+ $(examples)
+
+
+#dist_html_DATA =
+gnupg_TEXINFOS = \
+ gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi instguide.texi \
+ tools.texi debugging.texi glossary.texi contrib.texi gpl.texi \
+ sysnotes.texi gnupg-card-architecture.fig dirmngr.texi \
+ howtos.texi howto-create-a-server-cert.texi
+
+DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
+AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css
+YAT2M_OPTIONS = -I $(srcdir) \
+ --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.1"
+
+myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
+ dirmngr.texi scdaemon.texi tools.texi
+
+myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 gpgv2.1 \
+ watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
+ gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
- applygnupgdefaults.8 gpg-zip.1 \
++ applygnupgdefaults.8 \
+ dirmngr-client.1
+
+man_MANS = $(myman_pages) gnupg.7
+watchgnupg_SOURCE = gnupg.texi
+CLEANFILES = yat2m mkdefsinc defs.inc
+DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
- $(myman_pages) gnupg.7
++ $(myman_pages) gpg-zip.1 gpgkey2ssh.1 gnupg.7
+
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .dvi .eps .fig .html .info .jpg .o .pdf .png .ps .rc .texi
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+.texi.info:
+ $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+ am__cwd=`pwd` && $(am__cd) $(srcdir) && \
+ rm -rf $$backupdir && mkdir $$backupdir && \
+ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
+ for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+ if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
+ done; \
+ else :; fi && \
+ cd "$$am__cwd"; \
+ if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+ -o $@ $<; \
+ then \
+ rc=0; \
+ $(am__cd) $(srcdir); \
+ else \
+ rc=$$?; \
+ $(am__cd) $(srcdir) && \
+ $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+ fi; \
+ rm -rf $$backupdir; exit $$rc
+
+.texi.dvi:
+ $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+ $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+ $<
+
+.texi.pdf:
+ $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+ $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+ $<
+
+.texi.html:
+ $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
+ $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+ -o $(@:.html=.htp) $<; \
+ then \
+ rm -rf $@ && mv $(@:.html=.htp) $@; \
+ else \
+ rm -rf $(@:.html=.htp); exit 1; \
+ fi
+$(srcdir)/gnupg.info: gnupg.texi $(gnupg_TEXINFOS)
+gnupg.dvi: gnupg.texi $(gnupg_TEXINFOS)
+gnupg.pdf: gnupg.texi $(gnupg_TEXINFOS)
+gnupg.html: gnupg.texi $(gnupg_TEXINFOS)
+.dvi.ps:
+ $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ $(DVIPS) $(AM_V_texinfo) -o $@ $<
+
+uninstall-dvi-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
+ rm -f "$(DESTDIR)$(dvidir)/$$f"; \
+ done
+
+uninstall-html-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
+ rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
+ done
+
+uninstall-info-am:
+ @$(PRE_UNINSTALL)
+ @if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
+ list='$(INFO_DEPS)'; \
+ for file in $$list; do \
+ relfile=`echo "$$file" | sed 's|^.*/||'`; \
+ echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
+ if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
+ then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \
+ done; \
+ else :; fi
+ @$(NORMAL_UNINSTALL)
+ @list='$(INFO_DEPS)'; \
+ for file in $$list; do \
+ relfile=`echo "$$file" | sed 's|^.*/||'`; \
+ relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
+ (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
+ echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
+ rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
+ else :; fi); \
+ done
+
+uninstall-pdf-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+ done
+
+uninstall-ps-am:
+ @$(NORMAL_UNINSTALL)
+ @list='$(PSS)'; test -n "$(psdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(psdir)/$$f"; \
+ done
+
+dist-info: $(INFO_DEPS)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ list='$(INFO_DEPS)'; \
+ for base in $$list; do \
+ case $$base in \
+ $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
+ esac; \
+ if test -f $$base; then d=.; else d=$(srcdir); fi; \
+ base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
+ for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
+ if test -f $$file; then \
+ relfile=`expr "$$file" : "$$d/\(.*\)"`; \
+ test -f "$(distdir)/$$relfile" || \
+ cp -p $$file "$(distdir)/$$relfile"; \
+ else :; fi; \
+ done; \
+ done
+
+mostlyclean-aminfo:
+ -rm -rf gnupg.t2d gnupg.t2p
+
+clean-aminfo:
+ -test -z "gnupg.dvi gnupg.pdf gnupg.ps gnupg.html" \
+ || rm -rf gnupg.dvi gnupg.pdf gnupg.ps gnupg.html
+
+maintainer-clean-aminfo:
+ @list='$(INFO_DEPS)'; for i in $$list; do \
+ i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
+ echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
+ rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
+ done
+install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+ @list1=''; \
+ list2='$(man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list=''; test -n "$(man1dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-man7: $(man_MANS)
+ @$(NORMAL_INSTALL)
+ @list1=''; \
+ list2='$(man_MANS)'; \
+ test -n "$(man7dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.7[a-z]*$$/p'; \
+ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man7:
+ @$(NORMAL_UNINSTALL)
+ @list=''; test -n "$(man7dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.7[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
+install-man8: $(man_MANS)
+ @$(NORMAL_INSTALL)
+ @list1=''; \
+ list2='$(man_MANS)'; \
+ test -n "$(man8dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.8[a-z]*$$/p'; \
+ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man8:
+ @$(NORMAL_UNINSTALL)
+ @list=''; test -n "$(man8dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.8[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+ done
+
+uninstall-dist_pkgdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
+install-nobase_dist_docDATA: $(nobase_dist_doc_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(nobase_dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+ fi; \
+ $(am__nobase_list) | while read dir files; do \
+ xfiles=; for file in $$files; do \
+ if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+ test -z "$$xfiles" || { \
+ test "x$$dir" = x. || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)/$$dir'"; \
+ $(MKDIR_P) "$(DESTDIR)$(docdir)/$$dir"; }; \
+ echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(docdir)/$$dir'"; \
+ $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(docdir)/$$dir" || exit $$?; }; \
+ done
+
+uninstall-nobase_dist_docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nobase_dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-info dist-hook
+check-am: all-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(INFO_DEPS) $(MANS) $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(docdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-aminfo clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am: $(DVIS)
+
+html: html-am
+
+html-am: $(HTMLS)
+
+info: info-am
+
+info-am: $(INFO_DEPS)
+
+install-data-am: install-dist_pkgdataDATA install-info-am install-man \
+ install-nobase_dist_docDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am: $(DVIS)
+ @$(NORMAL_INSTALL)
+ @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
+ done
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ $(am__strip_dir) \
+ d2=$$d$$p; \
+ if test -d "$$d2"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+ else \
+ list2="$$list2 $$d2"; \
+ fi; \
+ done; \
+ test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
+ done; }
+install-info: install-info-am
+
+install-info-am: $(INFO_DEPS)
+ @$(NORMAL_INSTALL)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
+ fi; \
+ for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ esac; \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
+ file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
+ for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
+ $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+ if test -f $$ifile; then \
+ echo "$$ifile"; \
+ else : ; fi; \
+ done; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
+ @$(POST_INSTALL)
+ @if $(am__can_run_installinfo); then \
+ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+ for file in $$list; do \
+ relfile=`echo "$$file" | sed 's|^.*/||'`; \
+ echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
+ install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
+ done; \
+ else : ; fi
+install-man: install-man1 install-man7 install-man8
+
+install-pdf: install-pdf-am
+
+install-pdf-am: $(PDFS)
+ @$(NORMAL_INSTALL)
+ @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
+install-ps: install-ps-am
+
+install-ps-am: $(PSS)
+ @$(NORMAL_INSTALL)
+ @list='$(PSS)'; test -n "$(psdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-aminfo \
+ maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-aminfo mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am: $(PDFS)
+
+ps: ps-am
+
+ps-am: $(PSS)
+
+uninstall-am: uninstall-dist_pkgdataDATA uninstall-dvi-am \
+ uninstall-html-am uninstall-info-am uninstall-man \
+ uninstall-nobase_dist_docDATA uninstall-pdf-am uninstall-ps-am
+
+uninstall-man: uninstall-man1 uninstall-man7 uninstall-man8
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-aminfo clean-generic \
+ cscopelist-am ctags-am dist-hook dist-info distclean \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+ install-dist_pkgdataDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-man1 \
+ install-man7 install-man8 install-nobase_dist_docDATA \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-aminfo \
+ maintainer-clean-generic mostlyclean mostlyclean-aminfo \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-dist_pkgdataDATA uninstall-dvi-am \
+ uninstall-html-am uninstall-info-am uninstall-man \
+ uninstall-man1 uninstall-man7 uninstall-man8 \
+ uninstall-nobase_dist_docDATA uninstall-pdf-am uninstall-ps-am
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
++gnupg.texi : defs.inc
++
+yat2m: yat2m.c
+ $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+
+mkdefsinc: mkdefsinc.c Makefile ../config.h
+ $(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \
+ -o $@ $(srcdir)/mkdefsinc.c
+
+.fig.png:
+ fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
+
+.fig.jpg:
+ fig2dev -L jpeg `test -f '$<' || echo '$(srcdir)/'`$< $@
+
+.fig.eps:
+ fig2dev -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@
+
+.fig.pdf:
+ fig2dev -L pdf `test -f '$<' || echo '$(srcdir)/'`$< $@
+
+yat2m-stamp: $(myman_sources) defs.inc
+ @rm -f yat2m-stamp.tmp
+ @touch yat2m-stamp.tmp
++ incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ --date "`cat $$incd 2>/dev/null`" \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+yat2m-stamp: yat2m
+
+$(myman_pages) gnupg.7 : yat2m-stamp defs.inc
+ @if test -f $@; then :; else \
+ trap 'rm -rf yat2m-stamp yat2m-lock' 1 2 13 15; \
+ if mkdir yat2m-lock 2>/dev/null; then \
+ rm -f yat2m-stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) yat2m-stamp; \
+ rmdir yat2m-lock; \
+ else \
+ while test -d yat2m-lock; do sleep 1; done; \
+ test -f yat2m-stamp; exit $$?; \
+ fi; \
+ fi
+
+dist-hook: defsincdate
+
+defsincdate: $(gnupg_TEXINFOS)
+ : >defsincdate ; \
+ if test -d $(top_srcdir)/.git; then \
+ (cd $(srcdir) && git log -1 --format='%ct' \
+ -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
+ fi
+
+defs.inc : defsincdate Makefile mkdefsinc
+ incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
+ ./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
+ $(gnupg_TEXINFOS) >$@
+
+online: gnupg.html gnupg.pdf
+ set -e; \
+ echo "Uploading current manuals to www.gnupg.org ..."; \
+ cp $(srcdir)/gnupg-logo-tr.png gnupg.html/; \
+ user=werner ; webhost="ftp.gnupg.org" ; dashdevel="" ; \
+ if echo "@PACKAGE_VERSION@" | grep -- "-beta" >/dev/null; then \
+ dashdevel="-devel" ; \
+ else \
+ rsync -v gnupg.pdf $${user}@$${webhost}:webspace/manuals/ ; \
+ fi ; \
+ cd gnupg.html ; \
+ rsync -vr --exclude='.git' . \
+ $${user}@$${webhost}:webspace/manuals/gnupg$${dashdevel}/
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc doc/defsincdate
index 00856d7,0000000..939c55d
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1444311653
++1449055655
diff --cc doc/gnupg.info
index 7eb5c54,0000000..dff75c6
mode 100644,000000..100644
--- a/doc/gnupg.info
+++ b/doc/gnupg.info
@@@ -1,209 -1,0 +1,212 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.9-beta58,
- October 2015).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.10, December
++2015).
+
+ (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: 954
- gnupg.info-2: 302633
++gnupg.info-1: 973
++gnupg.info-2: 303246
+
+Tag Table:
+(Indirect)
- Node: Top954
- Node: Installation2668
- Node: Invoking GPG-AGENT5017
- Node: Agent Commands6660
- Node: Agent Options7821
- Ref: option --options7978
- Ref: option --homedir8247
- Ref: option --log-file12891
- Ref: option --no-allow-mark-trusted13225
- Ref: option --allow-preset-passphrase13429
- Ref: option --allow-loopback-pinentry13582
- Ref: option --extra-socket20121
- Ref: option --enable-ssh-support20605
- Node: Agent Configuration22957
- Node: Agent Signals28359
- Node: Agent Examples29808
- Node: Agent Protocol30364
- Node: Agent PKDECRYPT32375
- Node: Agent PKSIGN34288
- Node: Agent GENKEY36589
- Node: Agent IMPORT38488
- Node: Agent EXPORT38930
- Node: Agent ISTRUSTED39145
- Node: Agent GET_PASSPHRASE41519
- Node: Agent CLEAR_PASSPHRASE43960
- Node: Agent PRESET_PASSPHRASE44351
- Node: Agent GET_CONFIRMATION45189
- Node: Agent HAVEKEY45861
- Node: Agent LEARN46493
- Node: Agent PASSWD46788
- Node: Agent UPDATESTARTUPTTY47254
- Node: Agent GETEVENTCOUNTER47732
- Node: Agent GETINFO48538
- Node: Agent OPTION49242
- Node: Invoking DIRMNGR51570
- Node: Dirmngr Commands52664
- Node: Dirmngr Options54775
- Ref: Dirmngr Options-Footnote-165715
- Node: Dirmngr Configuration65849
- Node: Dirmngr Signals69062
- Node: Dirmngr Examples70093
- Node: Dirmngr Protocol70775
- Node: Dirmngr LOOKUP71425
- Node: Dirmngr ISVALID72796
- Node: Dirmngr CHECKCRL75366
- Node: Dirmngr CHECKOCSP76422
- Node: Dirmngr CACHECERT77727
- Node: Dirmngr VALIDATE78565
- Node: Invoking GPG79133
- Node: GPG Commands80390
- Node: General GPG Commands81221
- Node: Operational GPG Commands81852
- Ref: option --export-ownertrust95605
- Node: OpenPGP Key Management97394
- Node: GPG Options111731
- Node: GPG Configuration Options113063
- Ref: gpg-option --options124919
- Node: GPG Key related Options143425
- Node: GPG Input and Output147640
- Node: OpenPGP Options154430
- Node: Compliance Options158596
- Node: GPG Esoteric Options162066
- Ref: GPG Esoteric Options-Footnote-1184941
- Node: Deprecated Options185095
- Node: GPG Configuration186563
- Node: GPG Examples190398
- Node: Unattended Usage of GPG194740
- Node: Unattended GPG key generation195179
- Node: Invoking GPGSM203899
- Node: GPGSM Commands204768
- Node: General GPGSM Commands205206
- Node: Operational GPGSM Commands205894
- Node: Certificate Management207928
- Node: GPGSM Options212866
- Node: Configuration Options213440
- Ref: gpgsm-option --options213709
- Node: Certificate Options216828
- Ref: gpgsm-option --validation-model219735
- Node: Input and Output220715
- Ref: option --p12-charset221298
- Ref: gpgsm-option --with-key-data222542
- Ref: gpgsm-option --with-validation222790
- Node: CMS Options223662
- Node: Esoteric Options224684
- Node: GPGSM Configuration229055
- Node: GPGSM Examples234720
- Node: Unattended Usage234917
- Node: Automated signature checking235508
- Node: CSR and certificate creation237339
- Node: GPGSM Protocol242279
- Node: GPGSM ENCRYPT243537
- Node: GPGSM DECRYPT246207
- Node: GPGSM SIGN247043
- Node: GPGSM VERIFY248490
- Node: GPGSM GENKEY249005
- Node: GPGSM LISTKEYS250020
- Ref: gpgsm-cmd listkeys250179
- Node: GPGSM EXPORT250941
- Node: GPGSM IMPORT251899
- Node: GPGSM DELETE252640
- Node: GPGSM GETAUDITLOG253147
- Ref: gpgsm-cmd getauditlog253318
- Node: GPGSM GETINFO253659
- Node: GPGSM OPTION254508
- Node: Invoking SCDAEMON257855
- Node: Scdaemon Commands258529
- Node: Scdaemon Options259649
- Node: Card applications268500
- Node: OpenPGP Card269165
- Node: NKS Card269638
- Node: DINSIG Card269964
- Node: PKCS#15 Card270340
- Node: Geldkarte Card270610
- Node: SmartCard-HSM271001
- Node: Undefined Card271596
- Node: Scdaemon Configuration272009
- Node: Scdaemon Examples273047
- Node: Scdaemon Protocol273230
- Node: Scdaemon SERIALNO274748
- Node: Scdaemon LEARN275678
- Node: Scdaemon READCERT276534
- Node: Scdaemon READKEY276935
- Node: Scdaemon PKSIGN277221
- Node: Scdaemon PKDECRYPT277947
- Node: Scdaemon GETATTR278696
- Node: Scdaemon SETATTR278900
- Node: Scdaemon WRITEKEY279107
- Node: Scdaemon GENKEY279811
- Node: Scdaemon RANDOM280016
- Node: Scdaemon PASSWD280239
- Node: Scdaemon CHECKPIN280632
- Node: Scdaemon RESTART281637
- Node: Scdaemon APDU282172
- Node: Specify a User ID283147
- Ref: how-to-specify-a-user-id283305
- Node: Helper Tools288194
- Node: watchgnupg289030
- Ref: option watchgnupg --tcp289758
- Node: gpgv291088
- Node: addgnupghome295190
- Node: gpgconf295888
- Ref: gpgconf-Footnote-1298024
- Node: Invoking gpgconf298322
- Node: Format conventions302633
- Node: Listing components307964
- Node: Checking programs310055
- Node: Listing options312802
- Node: Changing options320306
- Node: Listing global options322008
- Node: Files used by gpgconf323784
- Node: applygnupgdefaults324130
- Node: gpg-preset-passphrase324875
- Node: Invoking gpg-preset-passphrase325836
- Node: gpg-connect-agent327106
- Node: Invoking gpg-connect-agent327821
- Node: Controlling gpg-connect-agent331368
- Node: dirmngr-client337841
- Node: gpgparsemail341191
- Node: symcryptrun341509
- Node: Invoking symcryptrun342408
- Node: gpg-zip344920
- Node: Howtos346746
- Node: Howto Create a Server Cert347013
- Node: System Notes355444
- Node: W32 Notes357917
- Node: Debugging358339
- Node: Debugging Tools359168
- Node: kbxutil359448
- Ref: kbxutil-Footnote-1361019
- Node: Debugging Hints361115
- Node: Common Problems362252
- Node: Architecture Details367478
- Node: GnuPG-1 and GnuPG-2367729
- Node: Copying368053
- Node: Contributors405573
- Node: Glossary411814
- Node: Option Index414332
- Node: Index482464
++Node: Top973
++Node: Installation2706
++Node: Invoking GPG-AGENT5055
++Node: Agent Commands6698
++Node: Agent Options7859
++Ref: option --options8016
++Ref: option --homedir8285
++Ref: option --log-file12929
++Ref: option --no-allow-mark-trusted13263
++Ref: option --allow-preset-passphrase13467
++Ref: option --allow-loopback-pinentry13620
++Ref: option --extra-socket20159
++Ref: option --enable-ssh-support20643
++Node: Agent Configuration22995
++Node: Agent Signals28397
++Node: Agent Examples29846
++Node: Agent Protocol30402
++Node: Agent PKDECRYPT32413
++Node: Agent PKSIGN34326
++Node: Agent GENKEY36627
++Node: Agent IMPORT38526
++Node: Agent EXPORT38968
++Node: Agent ISTRUSTED39183
++Node: Agent GET_PASSPHRASE41557
++Node: Agent CLEAR_PASSPHRASE43998
++Node: Agent PRESET_PASSPHRASE44389
++Node: Agent GET_CONFIRMATION45227
++Node: Agent HAVEKEY45899
++Node: Agent LEARN46531
++Node: Agent PASSWD46826
++Node: Agent UPDATESTARTUPTTY47292
++Node: Agent GETEVENTCOUNTER47770
++Node: Agent GETINFO48576
++Node: Agent OPTION49280
++Node: Invoking DIRMNGR51608
++Node: Dirmngr Commands52702
++Node: Dirmngr Options54813
++Ref: Dirmngr Options-Footnote-166579
++Node: Dirmngr Configuration66713
++Node: Dirmngr Signals69926
++Node: Dirmngr Examples70957
++Node: Dirmngr Protocol71639
++Node: Dirmngr LOOKUP72289
++Node: Dirmngr ISVALID73660
++Node: Dirmngr CHECKCRL76230
++Node: Dirmngr CHECKOCSP77286
++Node: Dirmngr CACHECERT78591
++Node: Dirmngr VALIDATE79429
++Node: Invoking GPG79997
++Node: GPG Commands81254
++Node: General GPG Commands82085
++Node: Operational GPG Commands82716
++Ref: option --export-ownertrust96469
++Node: OpenPGP Key Management98575
++Node: GPG Options113078
++Node: GPG Configuration Options114410
++Ref: gpg-option --options126557
++Ref: trust-model-tofu130987
++Node: GPG Key related Options149431
++Node: GPG Input and Output153772
++Node: OpenPGP Options160562
++Node: Compliance Options164728
++Node: GPG Esoteric Options168198
++Ref: GPG Esoteric Options-Footnote-1191627
++Node: Deprecated Options191781
++Node: GPG Configuration193249
++Node: GPG Examples197084
++Node: Unattended Usage of GPG201426
++Node: Unattended GPG key generation201865
++Node: Invoking GPGSM210585
++Node: GPGSM Commands211454
++Node: General GPGSM Commands211892
++Node: Operational GPGSM Commands212580
++Node: Certificate Management214614
++Node: GPGSM Options219552
++Node: Configuration Options220126
++Ref: gpgsm-option --options220395
++Node: Certificate Options223514
++Ref: gpgsm-option --validation-model226421
++Node: Input and Output227401
++Ref: option --p12-charset227984
++Ref: gpgsm-option --with-key-data229228
++Ref: gpgsm-option --with-validation229476
++Node: CMS Options230348
++Node: Esoteric Options231370
++Node: GPGSM Configuration235741
++Node: GPGSM Examples241406
++Node: Unattended Usage241603
++Node: Automated signature checking242194
++Node: CSR and certificate creation244025
++Node: GPGSM Protocol248965
++Node: GPGSM ENCRYPT250223
++Node: GPGSM DECRYPT252893
++Node: GPGSM SIGN253729
++Node: GPGSM VERIFY255176
++Node: GPGSM GENKEY255691
++Node: GPGSM LISTKEYS256706
++Ref: gpgsm-cmd listkeys256865
++Node: GPGSM EXPORT257627
++Node: GPGSM IMPORT258585
++Node: GPGSM DELETE259326
++Node: GPGSM GETAUDITLOG259833
++Ref: gpgsm-cmd getauditlog260004
++Node: GPGSM GETINFO260345
++Node: GPGSM OPTION261194
++Node: Invoking SCDAEMON264541
++Node: Scdaemon Commands265215
++Node: Scdaemon Options266335
++Node: Card applications275186
++Node: OpenPGP Card275851
++Node: NKS Card276324
++Node: DINSIG Card276650
++Node: PKCS#15 Card277026
++Node: Geldkarte Card277296
++Node: SmartCard-HSM277687
++Node: Undefined Card278282
++Node: Scdaemon Configuration278695
++Node: Scdaemon Examples279733
++Node: Scdaemon Protocol279916
++Node: Scdaemon SERIALNO281434
++Node: Scdaemon LEARN282364
++Node: Scdaemon READCERT283220
++Node: Scdaemon READKEY283621
++Node: Scdaemon PKSIGN283907
++Node: Scdaemon PKDECRYPT284633
++Node: Scdaemon GETATTR285382
++Node: Scdaemon SETATTR285586
++Node: Scdaemon WRITEKEY285793
++Node: Scdaemon GENKEY286497
++Node: Scdaemon RANDOM286702
++Node: Scdaemon PASSWD286925
++Node: Scdaemon CHECKPIN287318
++Node: Scdaemon RESTART288323
++Node: Scdaemon APDU288858
++Node: Specify a User ID289833
++Ref: how-to-specify-a-user-id289991
++Node: Helper Tools294880
++Node: watchgnupg295782
++Ref: option watchgnupg --tcp296510
++Node: gpgv297840
++Node: addgnupghome303246
++Node: gpgconf303944
++Ref: gpgconf-Footnote-1306080
++Node: Invoking gpgconf306378
++Node: Format conventions309735
++Node: Listing components315066
++Node: Checking programs317157
++Node: Listing options319904
++Node: Changing options327408
++Node: Listing global options329110
++Node: Files used by gpgconf330886
++Node: applygnupgdefaults331232
++Node: gpg-preset-passphrase331977
++Node: Invoking gpg-preset-passphrase332938
++Node: gpg-connect-agent334208
++Node: Invoking gpg-connect-agent334923
++Node: Controlling gpg-connect-agent338470
++Node: dirmngr-client344943
++Node: gpgparsemail348293
++Node: symcryptrun348611
++Node: Invoking symcryptrun349510
++Node: gpg-zip352022
++Node: gpgkey2ssh353867
++Node: Howtos355138
++Node: Howto Create a Server Cert355405
++Node: System Notes363836
++Node: W32 Notes366309
++Node: Debugging366731
++Node: Debugging Tools367560
++Node: kbxutil367840
++Ref: kbxutil-Footnote-1369411
++Node: Debugging Hints369507
++Node: Common Problems370644
++Node: Architecture Details375870
++Node: GnuPG-1 and GnuPG-2376121
++Node: Copying376445
++Node: Contributors413965
++Node: Glossary420206
++Node: Option Index422724
++Node: Index491981
+
+End Tag Table
diff --cc doc/gnupg.info-1
index b888fc2,0000000..b9efb9f
mode 100644,000000..100644
--- a/doc/gnupg.info-1
+++ b/doc/gnupg.info-1
@@@ -1,7467 -1,0 +1,7433 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.9-beta58,
- October 2015).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.10, December
++2015).
+
+ (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.9-beta58,
- October 2015).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.10, December
++2015).
+
+ (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.
+* 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 shall not be used for any production quality keys.
+ This option is only effective when given on the command line.
+
+'--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.
+
+'--allow-loopback-pinentry'
+ Allow clients to use the loopback pinentry features; see the option
+ 'pinentry-mode' for details.
+
+'--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-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
+ 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.
+
+ 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 GPG_TTY environment variable 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="${HOME}/.gnupg/S.gpg-agent.ssh"
+ 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.
+
+ 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
+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. Use the *Note option --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 options is not yet functional! It will eventually switch
- GnuPG into a TOR mode to route all network access via TOR (an
- anonymity network).
-
- '--keyserver name'
- Use 'name' as your keyserver. This is the server that 'gpg'
++ 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
- global '--keyserver-options' from below, but apply only to this
- particular keyserver.
++ 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,
+ 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.
+
+'--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)
+
+'--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.
+
+
+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.
+
+'/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.
+
+ 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
+ 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.
+
+ 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
+**************
+
+'gpg2' 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. 'gpg2' features complete key management and all bells
+and whistles you can expect from a decent OpenPGP implementation.
+
+ In contrast to the standalone command gpg from GnuPG 1.x, which is
+might be better suited for server and embedded platforms, the 2.x
+version is commonly installed under the name 'gpg2' and targeted to the
+desktop as it requires several other modules to be installed.
+
+ The old 1.x version will be kept maintained and it is possible to
+install both versions on the same system. Documentation for the old
+GnuPG 1.x command is available as a man page and at *note GnuPG 1:
+(gpg)Top.
+
+ *Note Option Index::, for an index to 'gpg2''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.
+
+ 'gpg2' 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 RFC1991 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 ake 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, 'gpg2' 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.
+
+'--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').
+
+'--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 'gpg2' 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.
+
+'--list-packets'
+ List only the sequence of packets. This is mainly useful for
+ debugging. When used with option '--verbose' the actual MPI values
+ are dumped and not only their lengths.
+
+'--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'
+ Remove key from the secret keyring. In batch mode the key must be
+ specified by fingerprint.
+
+'--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.
+
+'--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.
+
+'--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.)
+
+'--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:
+ gpg2 --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
+ gpg2 --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-set-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'
+ 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 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.
+
+'--gen-key'
+ Generate a new key pair using the current default parameters. This
+ is the standard command to create a new key.
+
+'--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 the manual section "Unattended key generation" on
+ how to use this.
+
+'--gen-revoke name'
+ Generate a revocation certificate for the complete key. To revoke
+ a subkey or a signature, use the '--edit' command.
+
+'--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'. Use '*' to select
- all and '0' to deselect all.
++ 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.
+
+ 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 'gpg2 --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. 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.
+
+'--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
+==================
+
+'gpg2' 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.
++ 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 no.
+
+ 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 no.
++ 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
- no.
++ 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 no.
++ verified. Defaults to yes.
+
+ show-uid-validity
+ Display the calculated validity of the user IDs on the key
- that issued the signature. Defaults to no.
++ 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 feature.
+
+ 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 larger RSA secret
+ keys than is generally recommended (up to 8192 bits). These large
+ keys are more expensive to use, and their signatures and
+ certifications are also larger.
+
+'--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'.
+
+'--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|direct|always|auto'
++'--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.
+
+ 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
+ '--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.
+
+'--keyid-format short|0xshort|long|0xlong'
+ Select how to display key IDs. "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 option enables the automatic retrieving of keys from a
+ keyserver when verifying signatures made by keys that are not
+ on the local keyring.
+
+ Note that this option makes a "web bug" like behavior
+ possible. Keyserver 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.
+
+ 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 set, 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. 'gpg2' always requires the agent.
+
+'--gpg-agent-info'
+ This is dummy option. It has no effect when used with 'gpg2'.
+
+'--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'. This is only used as a
+ fallback when the environment variable 'DIRMNGR_INFO' is not set or
+ a running dirmngr cannot be connected.
+
+'--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 'gpg2'.
+
+'--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.
+
+'--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.
+
++'--encrypt-to-default-key'
++ If the default secret key is taken from '--default-key', then also
++ encrypt to that key.
++
+'--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'.
+
+'--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.
+
+'--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".
+
+'--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'.
+
+ 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.
+
+'--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.
+
+'--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.
+
+'--print-pka-records'
+ Modify the output of the list commands to print 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.
+
+'--print-dane-records'
+ Modify the output of the list commands to print 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.
+
+'--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-fingerprint'
+ Same as the command '--fingerprint' but changes only the format of
+ the output and may be used together with another command.
+
+'--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.
+
+'--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.
+
+'--personal-cipher-preferences string'
+ Set the list of personal cipher preferences to 'string'. Use 'gpg2
+ --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 'gpg2
+ --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
+ 'gpg2 --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 used to protect secret keys.
+ The default cipher is AES-128. This cipher is also used for
+ symmetric encryption with a passphrase if
+ '--personal-cipher-preferences' and '--cipher-algo' is not given.
+
+'--s2k-digest-algo name'
+ Use 'name' as the digest algorithm used to mangle the passphrases.
+ The default algorithm is SHA-1.
+
+'--s2k-mode n'
+ Selects how passphrases are mangled. If 'n' is 0 a plain
+ passphrase (which is not recommended) will be used, a 1 adds a salt
+ to the passphrase and a 3 (the default) iterates the whole process
+ a number of times (see -s2k-count). Unless '--rfc1991' is used,
+ this mode is also used for symmetric encryption with a passphrase.
+
+'--s2k-count n'
+ Specify how many times the passphrase mangling 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 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'.
+
+'--rfc2440'
+ Reset all packet, cipher and digest options to strict RFC-2440
+ behavior.
+
+'--rfc1991'
+ Try to be more RFC-1991 (PGP 2.x) compliant. This option is
+ deprecated will be removed in GnuPG 2.1.
+
+'--pgp2'
+ Set up all options to be as PGP 2.x compliant as possible, and warn
+ if an action is taken (e.g. encrypting to a non-RSA key) that will
+ create a message that PGP 2.x will not be able to handle. Note
+ that 'PGP 2.x' here means 'MIT PGP 2.6.2'. There are other
+ versions of PGP 2.x available, but the MIT release is a good common
+ baseline.
+
+ This option implies '--rfc1991 --disable-mdc --no-force-v4-certs
+ --escape-from-lines --force-v3-sigs --allow-weak-digest-algos
+ --cipher-algo IDEA --digest-algo MD5 --compress-algo ZIP'. It also
+ disables '--textmode' when encrypting.
+
+ This option is deprecated will be removed in GnuPG 2.1. The reason
+ for dropping PGP-2 support is that the PGP 2 format is not anymore
+ considered safe (for example due to the use of the broken MD5
+ algorithm). Note that the decryption of PGP-2 created messages
+ will continue to work.
+
+'--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
+ 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
+ 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 'gpg2' 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 the broken MD5 algorithm are normally rejected
- with an "invalid digest algorithm" message. This option allows the
- verification of signatures made with such weak algorithms.
++ 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.
+
+'--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
+'gpg2''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 'gpg2' 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 'gpg2' creates and maintains a few other files;
+They all live in in the current home directory (*note option
+--homedir::). Only the 'gpg2' program may modify these files.
+
+'~/.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/.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/secring.gpg.lock'
+ The lock file for the secret keyring.
+
+'~/.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.
+
+'/usr/local/lib/gnupg/'
+ Default location for extensions.
+
+ 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 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.
+
+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 'gpg2 --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 'gpg2 --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
+ $ gpg2 --batch --gen-key foo
+ [...]
+ $ gpg2 --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'. This is only used as a fallback
+ when the environment variable 'DIRMNGR_INFO' is not set or a
+ running dirmngr cannot be connected.
+
+'--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.
+
+'--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.
+
+'--fixed-passphrase STRING'
+ Supply the passphrase STRING to the gpg-protect-tool. This option
+ is only useful for the regression tests included with this package
+ and may be revised or removed at any time without notice.
+
+'--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
+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
+ 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.
+
+ 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.
+
+
+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.
++* gpgkey2ssh:: Emit GPG public keys in OpenSSH format.
+
+
+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
+=============================
+
+'gpgv2' 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.
+
+ 'gpgv2' 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.
+
+ 'gpgv2' 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
+--------------
+
+gpgv2 'pgpfile'
+gpgv2 '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.
-
- * 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'
- 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.
-
- '--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.
-
- 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.
-
diff --cc doc/gnupg.info-2
index 6093aab,0000000..9dd01e2
mode 100644,000000..100644
--- a/doc/gnupg.info-2
+++ b/doc/gnupg.info-2
@@@ -1,3697 -1,0 +1,3923 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.9-beta58,
- October 2015).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.10, December
++2015).
+
+ (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: 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.
++
++* 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'
++ 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.
++
++'--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.
++
++ 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
+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 tehre or teh OCSP request returned
++ 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.
+'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
++File: gnupg.info, Node: gpg-zip, Next: gpgkey2ssh, 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: gpgkey2ssh, Prev: gpg-zip, Up: Helper Tools
++
++8.12 Emit GPG public keys in OpenSSH format
++===========================================
++
++This tool is deprecated and will be removed soon.
++
++ 'gpgkey2ssh' emits the public key of an OpenPGP RSA or DSA key in a
++format readable by OpenSSH clients and servers.
++
++ It takes only a single argument, a key ID, which designates the
++primary key or subkey whose public key should be converted.
++
++ The key ID should use upper-case (A-F, not a-f) for all hex digits
++greater than 9, and the key in question must be present in 'gpg''s
++public keyring.
++
++ The output of a successful run can be used verbatim as an entry in an
++'authorized_keys' file for 'sshd', or can be prefixed with a host name
++and appended to a 'known_hosts' file for 'ssh'.
++
++ The program returns 0 if the key was successfully converted and
++non-zero if there was an error (e.g., if the key ID was malformed, the
++key was not present in the public keyring, or if the key is not an RSA
++or DSA key).
++
++8.12.1 Environment
++------------------
++
++HOME
++ Used to locate the default home directory.
++
++GNUPGHOME
++ If set directory used instead of "~/.gnupg".
++
++8.12.2 FILES
++------------
++
++gpg2
++ The command used to search the user's keyring.
++
++
+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:
+
+ * For logging to sockets and other internal operations the
+ 'fopencookie' function ('funopen' under *BSD) is used. This is a
+ very convenient function which makes it possible to create outputs
+ in a structures and easy maintainable way. The drawback however is
+ that most proprietary OSes don't support this function. At
+ g10 Code we have looked into several ways on how to overcome this
+ limitation but no sufficiently easy and maintainable way has been
+ found. Porting _glibc_ to a general POSIX system is of course an
+ option and would make writing portable software much easier; this
+ it has not yet been done and the system administrator would need to
+ cope with the GNU specific admin things in addition to the generic
+ ones of his system.
+
+ We have now settled to use explicit stdio wrappers with a
+ functionality similar to funopen. Although the code for this has
+ already been written (_libestream_), we have not yet changed GnuPG
+ to use it.
+
+ This means that on systems not supporting either 'funopen' or
+ 'fopencookie', logging to a socket won't work, prompts are not
+ formatted as pretty as they should be and 'gpgsm''s 'LISTKEYS'
+ Assuan command does not work.
+
+ * 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:
+
+* GnuPG-1 and GnuPG-2:: Relationship between the two branches.
+
+
+File: gnupg.info, Node: GnuPG-1 and GnuPG-2, Up: Architecture Details
+
+11.4.1 Relationship between the two branches.
+---------------------------------------------
+
+Here is a little picture showing how the components work together:
+
+
+
+Lets try to explain it:
+
+ TO BE DONE.
+
+
+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: Index, Prev: Glossary, Up: Top
+
+Option Index
+************
+
+
+* Menu:
+
- * add-servers: Dirmngr Options. (line 181)
++* add-servers: Dirmngr Options. (line 195)
+* agent-program: GPG Configuration Options.
- (line 606)
++ (line 690)
+* 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 169)
+* allow-freeform-uid: GPG Esoteric Options.
+ (line 335)
+* allow-loopback-pinentry: Agent Options. (line 155)
+* allow-multiple-messages: GPG Esoteric Options.
- (line 461)
++ (line 472)
+* allow-non-selfsigned-uid: GPG Esoteric Options.
+ (line 330)
- * allow-ocsp: Dirmngr Options. (line 198)
++* allow-ocsp: Dirmngr Options. (line 212)
+* allow-preset-passphrase: Agent Options. (line 151)
+* allow-secret-key-import: GPG Esoteric Options.
- (line 457)
++ (line 468)
+* 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 444)
++ (line 455)
+* ask-cert-level: GPG Configuration Options.
- (line 330)
++ (line 334)
+* ask-sig-expire: GPG Esoteric Options.
- (line 430)
++ (line 441)
+* 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 593)
++ (line 677)
+* auto-issuer-key-retrieve: Certificate Options. (line 50)
+* auto-key-locate: GPG Configuration Options.
- (line 410)
++ (line 472)
+* base64: Input and Output. (line 11)
+* batch: Agent Options. (line 44)
+* batch <1>: GPG Configuration Options.
- (line 39)
++ (line 43)
+* bzip2-compress-level: GPG Configuration Options.
- (line 304)
++ (line 308)
+* bzip2-decompress-lowmem: GPG Configuration Options.
- (line 314)
++ (line 318)
+* 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 171)
+* card-status: Operational GPG Commands.
+ (line 177)
+* 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 180)
+* check-passphrase-pattern: Agent Options. (line 219)
+* check-sigs: Operational GPG Commands.
+ (line 139)
+* check-trustdb: Operational GPG Commands.
+ (line 285)
+* 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 572)
++ (line 634)
+* compress-algo: GPG Esoteric Options.
+ (line 204)
+* compress-level: GPG Configuration Options.
- (line 304)
++ (line 308)
+* csh: Agent Options. (line 129)
+* 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 339)
+* 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 117)
+* 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 180)
+* default-cache-ttl <1>: Agent Options. (line 186)
+* default-cert-expire: GPG Esoteric Options.
- (line 450)
++ (line 461)
+* default-cert-level: GPG Configuration Options.
- (line 338)
++ (line 342)
+* default-key: GPG Configuration Options.
+ (line 10)
+* default-key <1>: Input and Output. (line 34)
+* default-keyserver-url: GPG Esoteric Options.
- (line 489)
++ (line 500)
+* default-preference-list: GPG Esoteric Options.
- (line 484)
++ (line 495)
+* default-recipient: GPG Configuration Options.
- (line 15)
- * default-recipient-self: GPG Configuration Options.
+ (line 19)
++* default-recipient-self: GPG Configuration Options.
++ (line 23)
+* default-sig-expire: GPG Esoteric Options.
- (line 436)
++ (line 447)
+* delete-keys: Certificate Management.
+ (line 59)
+* delete-secret-and-public-key: Operational GPG Commands.
+ (line 195)
+* delete-secret-keys: Operational GPG Commands.
+ (line 191)
+* deny-admin: Scdaemon Options. (line 192)
+* desig-revoke: OpenPGP Key Management.
+ (line 44)
+* 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 613)
++ (line 697)
+* 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 278)
+* disable-cipher-algo: GPG Esoteric Options.
+ (line 235)
+* disable-crl-checks: Certificate Options. (line 13)
+* disable-dsa2: GPG Configuration Options.
- (line 179)
- * disable-http: Dirmngr Options. (line 118)
++ (line 183)
++* disable-http: Dirmngr Options. (line 132)
+* disable-large-rsa: GPG Configuration Options.
- (line 172)
- * disable-ldap: Dirmngr Options. (line 115)
++ (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 272)
+* disable-trusted-cert-crl-check: Certificate Options. (line 19)
+* display: Agent Options. (line 296)
+* display-charset: GPG Configuration Options.
- (line 259)
++ (line 263)
+* display-charset:iso-8859-1: GPG Configuration Options.
- (line 268)
++ (line 272)
+* display-charset:iso-8859-15: GPG Configuration Options.
- (line 274)
++ (line 278)
+* display-charset:iso-8859-2: GPG Configuration Options.
- (line 271)
++ (line 275)
+* display-charset:koi8-r: GPG Configuration Options.
- (line 277)
++ (line 281)
+* display-charset:utf-8: GPG Configuration Options.
- (line 280)
++ (line 284)
+* 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 49)
+* emit-version: GPG Esoteric Options.
+ (line 109)
+* enable-crl-checks: Certificate Options. (line 13)
+* enable-dsa2: GPG Configuration Options.
- (line 179)
++ (line 183)
+* enable-large-rsa: GPG Configuration Options.
- (line 172)
++ (line 176)
+* enable-ocsp: Certificate Options. (line 41)
+* enable-passphrase-history: Agent Options. (line 238)
+* 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 316)
+* enable-special-filenames: GPG Esoteric Options.
- (line 471)
++ (line 482)
+* enable-ssh-support: Agent Options. (line 316)
+* enable-trusted-cert-crl-check: Certificate Options. (line 19)
+* enarmor: Operational GPG Commands.
+ (line 339)
+* 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 21)
++* encrypt-to-default-key: GPG Key related Options.
++ (line 37)
+* enforce-passphrase-constraints: Agent Options. (line 204)
+* escape-from-lines: GPG Esoteric Options.
+ (line 265)
+* exec: Invoking gpg-connect-agent.
+ (line 65)
+* exec-path: GPG Configuration Options.
- (line 203)
++ (line 207)
+* exit-on-status-write-error: GPG Configuration Options.
- (line 641)
++ (line 725)
+* expert: GPG Configuration Options.
- (line 699)
++ (line 783)
+* export: Operational GPG Commands.
+ (line 200)
+* export <1>: Certificate Management.
+ (line 68)
+* export-options: GPG Input and Output.
+ (line 75)
+* export-ownertrust: Operational GPG Commands.
+ (line 300)
+* 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 216)
+* export-secret-subkeys: Operational GPG Commands.
+ (line 216)
+* extra-digest-algo: Esoteric Options. (line 7)
+* extra-socket: Agent Options. (line 306)
+* 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 390)
++ (line 401)
+* fetch-crl: Dirmngr Commands. (line 44)
+* fetch-keys: Operational GPG Commands.
+ (line 270)
+* fingerprint: Operational GPG Commands.
+ (line 159)
+* fixed-list-mode: GPG Input and Output.
+ (line 131)
+* fixed-passphrase: Esoteric Options. (line 100)
+* 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 28)
+* gen-key <1>: OpenPGP Key Management.
+ (line 32)
+* gen-key <2>: Certificate Management.
+ (line 7)
+* gen-prime: Operational GPG Commands.
+ (line 334)
+* gen-random: Operational GPG Commands.
+ (line 327)
+* gen-revoke: OpenPGP Key Management.
+ (line 40)
+* gnupg: Compliance Options. (line 12)
+* gnutls-debug: Dirmngr Options. (line 70)
+* gpg: gpg-zip. (line 50)
+* gpg-agent-info: GPG Configuration Options.
- (line 603)
++ (line 687)
+* gpg-args: gpg-zip. (line 53)
+* gpgconf-list: GPG Esoteric Options.
- (line 505)
++ (line 516)
+* gpgconf-test: GPG Esoteric Options.
- (line 509)
++ (line 520)
+* group: GPG Key related Options.
- (line 41)
++ (line 45)
+* 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 29)
+* hidden-recipient: GPG Key related Options.
+ (line 14)
+* homedir: Agent Options. (line 13)
+* homedir <1>: GPG Configuration Options.
- (line 238)
++ (line 242)
+* 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 137)
- * http-proxy: Dirmngr Options. (line 141)
++* honor-http-proxy: Dirmngr Options. (line 151)
++* http-proxy: Dirmngr Options. (line 155)
+* ignore-cache-for-signing: Agent Options. (line 174)
- * ignore-cert-extension: Dirmngr Options. (line 247)
++* 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 121)
- * ignore-ldap-dp: Dirmngr Options. (line 128)
++* 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 133)
++* 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 239)
+* import <1>: Certificate Management.
+ (line 98)
+* import-options: GPG Input and Output.
+ (line 29)
+* import-ownertrust: Operational GPG Commands.
+ (line 306)
+* include-certs: CMS Options. (line 7)
+* interactive: GPG Esoteric Options.
+ (line 19)
+* keep-display: Agent Options. (line 301)
+* keep-tty: Agent Options. (line 301)
+* keydb-clear-some-cert-flags: Certificate Management.
+ (line 51)
+* keyedit:addcardkey: OpenPGP Key Management.
- (line 186)
++ (line 190)
+* keyedit:addkey: OpenPGP Key Management.
- (line 183)
++ (line 187)
+* keyedit:addphoto: OpenPGP Key Management.
- (line 105)
++ (line 109)
+* keyedit:addrevoker: OpenPGP Key Management.
- (line 234)
++ (line 238)
+* keyedit:adduid: OpenPGP Key Management.
- (line 102)
++ (line 106)
+* keyedit:bkuptocard: OpenPGP Key Management.
- (line 200)
++ (line 204)
+* keyedit:check: OpenPGP Key Management.
- (line 98)
++ (line 102)
+* keyedit:clean: OpenPGP Key Management.
- (line 247)
++ (line 251)
+* keyedit:cross-certify: OpenPGP Key Management.
- (line 261)
++ (line 265)
+* keyedit:delkey: OpenPGP Key Management.
- (line 211)
++ (line 215)
+* keyedit:delsig: OpenPGP Key Management.
- (line 88)
++ (line 92)
+* keyedit:deluid: OpenPGP Key Management.
- (line 115)
++ (line 119)
+* keyedit:disable: OpenPGP Key Management.
- (line 230)
++ (line 234)
+* keyedit:enable: OpenPGP Key Management.
- (line 230)
++ (line 234)
+* keyedit:expire: OpenPGP Key Management.
- (line 219)
++ (line 223)
+* keyedit:key: OpenPGP Key Management.
+ (line 58)
+* keyedit:keyserver: OpenPGP Key Management.
- (line 132)
++ (line 136)
+* keyedit:keytocard: OpenPGP Key Management.
- (line 189)
++ (line 193)
+* keyedit:lsign: OpenPGP Key Management.
+ (line 69)
+* keyedit:minimize: OpenPGP Key Management.
- (line 256)
++ (line 260)
+* keyedit:notation: OpenPGP Key Management.
- (line 139)
++ (line 143)
+* keyedit:nrsign: OpenPGP Key Management.
+ (line 74)
+* keyedit:passwd: OpenPGP Key Management.
- (line 240)
++ (line 244)
+* keyedit:pref: OpenPGP Key Management.
- (line 147)
++ (line 151)
+* keyedit:primary: OpenPGP Key Management.
- (line 124)
++ (line 128)
+* keyedit:quit: OpenPGP Key Management.
- (line 272)
++ (line 276)
+* keyedit:revkey: OpenPGP Key Management.
- (line 216)
++ (line 220)
+* keyedit:revsig: OpenPGP Key Management.
- (line 93)
++ (line 97)
+* keyedit:revuid: OpenPGP Key Management.
- (line 121)
++ (line 125)
+* keyedit:save: OpenPGP Key Management.
- (line 269)
++ (line 273)
+* keyedit:setpref: OpenPGP Key Management.
- (line 159)
++ (line 163)
+* keyedit:showphoto: OpenPGP Key Management.
- (line 112)
++ (line 116)
+* keyedit:showpref: OpenPGP Key Management.
- (line 151)
++ (line 155)
+* keyedit:sign: OpenPGP Key Management.
+ (line 62)
+* keyedit:toggle: OpenPGP Key Management.
- (line 243)
++ (line 247)
+* keyedit:trust: OpenPGP Key Management.
- (line 225)
++ (line 229)
+* keyedit:tsign: OpenPGP Key Management.
+ (line 78)
+* keyedit:uid: OpenPGP Key Management.
+ (line 54)
+* keyid-format: GPG Configuration Options.
- (line 457)
++ (line 519)
+* keyring: GPG Configuration Options.
- (line 210)
++ (line 214)
+* keyring <1>: gpgv. (line 36)
- * keyserver: Dirmngr Options. (line 96)
++* keyserver: Dirmngr Options. (line 98)
+* keyserver <1>: GPG Configuration Options.
- (line 464)
++ (line 526)
+* keyserver-options: GPG Configuration Options.
- (line 487)
++ (line 549)
+* kill: Invoking gpgconf. (line 60)
+* launch: Invoking gpgconf. (line 53)
+* lc-ctype: Agent Options. (line 296)
+* lc-messages: Agent Options. (line 296)
- * ldap-proxy: Dirmngr Options. (line 146)
- * ldapserverlist-file: Dirmngr Options. (line 157)
- * ldaptimeout: Dirmngr Options. (line 176)
++* 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 137)
+* limit-card-insert-tries: GPG Configuration Options.
- (line 650)
++ (line 734)
+* list-archive: gpg-zip. (line 43)
+* list-chain: Certificate Management.
+ (line 31)
+* list-config: GPG Esoteric Options.
- (line 494)
++ (line 505)
+* list-crls: Dirmngr Commands. (line 32)
+* list-gcrypt-config: GPG Esoteric Options.
- (line 502)
++ (line 513)
+* 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 59)
++ (line 63)
+* list-options:show-keyring: GPG Configuration Options.
- (line 108)
++ (line 112)
+* list-options:show-keyserver-urls: GPG Configuration Options.
- (line 92)
++ (line 96)
+* list-options:show-notations: GPG Configuration Options.
- (line 87)
++ (line 91)
+* list-options:show-photos: GPG Configuration Options.
- (line 67)
++ (line 71)
+* list-options:show-policy-urls: GPG Configuration Options.
- (line 81)
++ (line 85)
+* list-options:show-sig-expire: GPG Configuration Options.
- (line 112)
- * list-options:show-sig-subpackets: GPG Configuration Options.
+ (line 116)
++* list-options:show-sig-subpackets: GPG Configuration Options.
++ (line 120)
+* list-options:show-std-notations: GPG Configuration Options.
- (line 87)
++ (line 91)
+* list-options:show-uid-validity: GPG Configuration Options.
- (line 96)
++ (line 100)
+* list-options:show-unusable-subkeys: GPG Configuration Options.
- (line 104)
++ (line 108)
+* list-options:show-unusable-uids: GPG Configuration Options.
- (line 100)
++ (line 104)
+* list-options:show-usage: GPG Configuration Options.
- (line 75)
++ (line 79)
+* list-options:show-user-notations: GPG Configuration Options.
- (line 87)
++ (line 91)
+* list-packets: Operational GPG Commands.
+ (line 166)
+* list-secret-keys: Operational GPG Commands.
+ (line 115)
+* list-secret-keys <1>: Certificate Management.
+ (line 23)
+* list-sigs: Operational GPG Commands.
+ (line 121)
+* load-crl: Dirmngr Commands. (line 36)
+* load-crl <1>: dirmngr-client. (line 80)
+* local-user: GPG Key related Options.
- (line 63)
++ (line 67)
+* local-user <1>: Input and Output. (line 41)
+* local-user <2>: gpg-zip. (line 40)
+* locate-keys: Operational GPG Commands.
+ (line 152)
+* lock-multiple: GPG Configuration Options.
- (line 630)
++ (line 714)
+* lock-never: GPG Configuration Options.
- (line 634)
++ (line 718)
+* lock-once: GPG Configuration Options.
- (line 626)
++ (line 710)
+* log-file: Agent Options. (line 139)
+* log-file <1>: Dirmngr Options. (line 33)
+* log-file <2>: GPG Esoteric Options.
+ (line 83)
+* log-file <3>: Configuration Options.
+ (line 78)
+* 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 307)
++ (line 311)
+* mangle-dos-filenames: GPG Configuration Options.
- (line 322)
++ (line 326)
+* marginals-needed: GPG Configuration Options.
- (line 576)
++ (line 638)
+* max-cache-ttl: Agent Options. (line 192)
+* max-cache-ttl-ssh: Agent Options. (line 198)
+* max-cert-depth: GPG Configuration Options.
- (line 580)
++ (line 664)
+* max-output: GPG Input and Output.
+ (line 19)
+* max-passphrase-days: Agent Options. (line 233)
- * max-replies: Dirmngr Options. (line 244)
++* max-replies: Dirmngr Options. (line 258)
+* min-cert-level: GPG Configuration Options.
- (line 367)
++ (line 371)
+* min-passphrase-len: Agent Options. (line 208)
+* min-passphrase-nonalpha: Agent Options. (line 213)
+* multi-server: Scdaemon Commands. (line 26)
+* multifile: Operational GPG Commands.
+ (line 86)
++* nameserver: Dirmngr Options. (line 121)
+* no: GPG Configuration Options.
- (line 56)
++ (line 60)
+* no-allow-external-cache: Agent Options. (line 159)
+* no-allow-mark-trusted: Agent Options. (line 146)
+* no-armor: GPG Input and Output.
+ (line 12)
+* no-autostart: GPG Configuration Options.
- (line 619)
++ (line 703)
+* no-autostart <1>: Configuration Options.
+ (line 67)
+* no-autostart <2>: Invoking gpg-connect-agent.
+ (line 77)
+* no-batch: GPG Configuration Options.
- (line 39)
++ (line 43)
+* no-common-certs-import: Esoteric Options. (line 105)
+* no-default-keyring: GPG Esoteric Options.
- (line 375)
++ (line 386)
+* no-default-recipient: GPG Configuration Options.
- (line 25)
++ (line 29)
+* no-detach: Agent Options. (line 122)
+* no-detach <1>: Scdaemon Options. (line 131)
+* no-encrypt-to: GPG Key related Options.
- (line 37)
++ (line 41)
+* no-expensive-trust-checks: GPG Esoteric Options.
- (line 476)
++ (line 487)
+* no-ext-connect: Invoking gpg-connect-agent.
+ (line 72)
+* no-grab: Agent Options. (line 135)
+* no-greeting: GPG Configuration Options.
- (line 664)
++ (line 748)
+* no-groups: GPG Key related Options.
- (line 59)
++ (line 63)
+* no-literal: GPG Esoteric Options.
- (line 398)
++ (line 409)
+* no-mangle-dos-filenames: GPG Configuration Options.
- (line 322)
++ (line 326)
+* no-mdc-warning: GPG Configuration Options.
- (line 683)
++ (line 767)
+* no-options: GPG Configuration Options.
- (line 297)
++ (line 301)
+* no-random-seed-file: GPG Configuration Options.
- (line 658)
++ (line 742)
+* no-secmem-warning: GPG Configuration Options.
- (line 667)
++ (line 751)
+* no-secmem-warning <1>: Configuration Options.
+ (line 74)
+* no-sig-cache: GPG Configuration Options.
- (line 583)
++ (line 667)
+* no-skip-hidden-recipients: GPG Key related Options.
- (line 86)
++ (line 90)
+* no-tty: GPG Configuration Options.
- (line 48)
++ (line 52)
+* no-use-standard-socket: Agent Options. (line 286)
+* no-verbose: GPG Configuration Options.
- (line 32)
++ (line 36)
+* not-dash-escaped: GPG Esoteric Options.
+ (line 255)
+* ocsp: dirmngr-client. (line 61)
- * ocsp-current-period: Dirmngr Options. (line 239)
- * ocsp-max-clock-skew: Dirmngr Options. (line 231)
- * ocsp-max-period: Dirmngr Options. (line 235)
- * ocsp-responder: Dirmngr Options. (line 205)
- * ocsp-signer: Dirmngr Options. (line 210)
- * only-ldap-proxy: Dirmngr Options. (line 152)
++* 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 292)
++ (line 296)
+* 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 421)
++ (line 432)
+* 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-file: GPG Esoteric Options.
+ (line 286)
+* passphrase-repeat: GPG Esoteric Options.
+ (line 272)
+* passwd: OpenPGP Key Management.
- (line 335)
++ (line 339)
+* passwd <1>: Certificate Management.
+ (line 108)
+* pcsc-driver: Scdaemon Options. (line 139)
+* pem: dirmngr-client. (line 58)
+* permission-warning: GPG Configuration Options.
- (line 670)
++ (line 754)
+* personal-cipher-preferences: OpenPGP Options. (line 35)
+* personal-compress-preferences: OpenPGP Options. (line 53)
+* personal-digest-preferences: OpenPGP Options. (line 44)
+* pgp2: Compliance Options. (line 38)
+* pgp6: Compliance Options. (line 57)
+* pgp7: Compliance Options. (line 67)
+* pgp8: Compliance Options. (line 73)
+* photo-viewer: GPG Configuration Options.
- (line 185)
++ (line 189)
+* pinentry-invisible-char: Agent Options. (line 241)
+* pinentry-mode: GPG Esoteric Options.
+ (line 303)
+* pinentry-program: Agent Options. (line 246)
+* pinentry-touch-file: Agent Options. (line 259)
+* ping: dirmngr-client. (line 69)
+* policy-file: Configuration Options.
+ (line 43)
+* prefer-system-dirmngr: Configuration Options.
+ (line 58)
+* preserve-permissions: GPG Esoteric Options.
- (line 479)
++ (line 490)
+* preset: Invoking gpg-preset-passphrase.
+ (line 20)
+* primary-keyring: GPG Configuration Options.
- (line 226)
++ (line 230)
+* print-dane-records: GPG Input and Output.
+ (line 125)
+* print-md: Operational GPG Commands.
+ (line 322)
+* print-pka-records: GPG Input and Output.
+ (line 119)
+* q: Invoking gpg-connect-agent.
+ (line 18)
+* q <1>: Invoking symcryptrun.
+ (line 33)
+* quick-adduid: OpenPGP Key Management.
- (line 328)
++ (line 332)
+* quick-gen-key: OpenPGP Key Management.
+ (line 9)
+* quick-lsign-key: OpenPGP Key Management.
- (line 313)
++ (line 317)
+* quick-sign-key: OpenPGP Key Management.
- (line 313)
++ (line 317)
+* quiet: Agent Options. (line 41)
+* quiet <1>: GPG Configuration Options.
- (line 35)
++ (line 39)
+* quiet <2>: gpgv. (line 33)
+* quiet <3>: Invoking gpgconf. (line 78)
+* 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 316)
+* recipient: GPG Key related Options.
+ (line 8)
+* recipient <1>: Input and Output. (line 46)
+* recipient <2>: gpg-zip. (line 36)
+* recv-keys: Operational GPG Commands.
+ (line 248)
+* refresh-keys: Operational GPG Commands.
+ (line 252)
+* reload: Invoking gpgconf. (line 48)
+* require-cross-certification: GPG Configuration Options.
- (line 692)
++ (line 776)
+* require-secmem: GPG Configuration Options.
- (line 687)
++ (line 771)
+* rfc1991: Compliance Options. (line 34)
+* rfc2440: Compliance Options. (line 30)
+* rfc4880: Compliance Options. (line 25)
+* run: Invoking gpg-connect-agent.
+ (line 82)
+* s: Dirmngr Options. (line 81)
+* s2k-cipher-algo: OpenPGP Options. (line 63)
+* s2k-count: OpenPGP Options. (line 80)
+* s2k-digest-algo: OpenPGP Options. (line 69)
+* s2k-mode: OpenPGP Options. (line 73)
+* scdaemon-program: Agent Options. (line 268)
+* search-keys: Operational GPG Commands.
+ (line 261)
+* secret-keyring: GPG Configuration Options.
- (line 221)
++ (line 225)
+* send-keys: Operational GPG Commands.
+ (line 207)
+* 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 402)
++ (line 413)
+* set-notation: GPG Esoteric Options.
+ (line 119)
+* set-policy-url: GPG Esoteric Options.
+ (line 149)
+* sh: Agent Options. (line 129)
+* 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 406)
++ (line 417)
+* 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 303)
++ (line 307)
+* skip-hidden-recipients: GPG Key related Options.
- (line 86)
++ (line 90)
+* skip-verify: GPG Esoteric Options.
- (line 382)
++ (line 393)
+* 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 642)
++* tofu-default-policy <1>: GPG Configuration Options.
++ (line 646)
++* tofu-set-policy: Operational GPG Commands.
++ (line 344)
+* trust-mode:always: GPG Configuration Options.
- (line 395)
++ (line 457)
+* trust-mode:auto: GPG Configuration Options.
- (line 404)
++ (line 466)
+* trust-mode:classic: GPG Configuration Options.
- (line 388)
++ (line 392)
+* trust-mode:direct: GPG Configuration Options.
- (line 391)
++ (line 453)
+* trust-mode:pgp: GPG Configuration Options.
- (line 383)
++ (line 387)
++* trust-mode:tofu: GPG Configuration Options.
++ (line 395)
++* trust-mode:tofu+pgp: GPG Configuration Options.
++ (line 441)
+* trust-model: GPG Configuration Options.
- (line 380)
++ (line 384)
+* trustdb-name: GPG Configuration Options.
- (line 231)
++ (line 235)
+* trusted-key: GPG Configuration Options.
- (line 373)
++ (line 377)
+* try-all-secrets: GPG Key related Options.
- (line 78)
++ (line 82)
+* try-secret-key: GPG Key related Options.
- (line 67)
++ (line 71)
+* ttyname: Agent Options. (line 296)
+* ttytype: Agent Options. (line 296)
+* ungroup: GPG Key related Options.
- (line 56)
++ (line 60)
+* update-trustdb: Operational GPG Commands.
+ (line 275)
+* url: dirmngr-client. (line 94)
+* url <1>: dirmngr-client. (line 98)
+* use-agent: GPG Configuration Options.
- (line 600)
++ (line 684)
+* use-embedded-filename: GPG Esoteric Options.
+ (line 183)
+* use-standard-socket: Agent Options. (line 286)
+* use-standard-socket-p: Agent Options. (line 286)
+* use-tor: Dirmngr Options. (line 91)
+* utf8-strings: GPG Configuration Options.
- (line 285)
++ (line 289)
+* 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 28)
++ (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 123)
++ (line 127)
+* verify-options:pka-lookups: GPG Configuration Options.
- (line 159)
++ (line 163)
+* verify-options:pka-trust-increase: GPG Configuration Options.
- (line 166)
++ (line 170)
+* verify-options:show-keyserver-urls: GPG Configuration Options.
- (line 142)
++ (line 146)
+* verify-options:show-notations: GPG Configuration Options.
- (line 138)
++ (line 142)
+* verify-options:show-photos: GPG Configuration Options.
- (line 128)
- * verify-options:show-policy-urls: 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 154)
++ (line 158)
+* verify-options:show-std-notations: GPG Configuration Options.
- (line 138)
++ (line 142)
+* verify-options:show-uid-validity: GPG Configuration Options.
- (line 146)
- * verify-options:show-unusable-uids: GPG Configuration Options.
+ (line 150)
++* verify-options:show-unusable-uids: GPG Configuration Options.
++ (line 154)
+* verify-options:show-user-notations: GPG Configuration Options.
- (line 138)
++ (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 111)
+* with-ephemeral-keys: Esoteric Options. (line 24)
+* with-fingerprint: GPG Input and Output.
+ (line 143)
+* with-icao-spelling: GPG Input and Output.
+ (line 147)
+* with-key-data: GPG Esoteric Options.
- (line 386)
++ (line 397)
+* with-key-data <1>: Input and Output. (line 54)
+* with-keygrip: GPG Input and Output.
+ (line 151)
+* with-secret: GPG Input and Output.
+ (line 154)
+* with-secret <1>: Input and Output. (line 78)
+* with-validation: Input and Output. (line 60)
+* xauthority: Agent Options. (line 296)
+* yes: GPG Configuration Options.
- (line 53)
++ (line 57)
+
+
+File: gnupg.info, Node: Index, Prev: Option Index, Up: Top
+
+Index
+*****
+
+
+* Menu:
+
+* com-certs.pem: GPGSM Configuration. (line 84)
+* 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)
+* gpg-agent.conf: Agent Configuration. (line 11)
+* gpg.conf: GPG Configuration. (line 11)
+* gpgconf.conf: Files used by gpgconf.
+ (line 7)
+* GPGSM command options: Invoking GPGSM. (line 6)
+* gpgsm.conf: GPGSM Configuration. (line 11)
+* help.txt: GPGSM Configuration. (line 72)
+* 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)
+* policies.txt: GPGSM Configuration. (line 18)
+* pubring.kbx: GPGSM Configuration. (line 100)
+* qualified.txt: GPGSM Configuration. (line 33)
+* random_seed: GPGSM Configuration. (line 106)
+* relax: Agent Configuration. (line 63)
+* S.gpg-agent: GPGSM Configuration. (line 111)
+* 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)
+* sshcontrol: Agent Configuration. (line 75)
+
diff --cc g10/Makefile.in
index fb01d26,0000000..25d4c40
mode 100644,000000..100644
--- a/g10/Makefile.in
+++ b/g10/Makefile.in
@@@ -1,1145 -1,0 +1,1182 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (C) 1998, 1999, 2000, 2001, 2002,
+# 2003, 2006, 2010 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(srcdir)/gpg.w32-manifest.in $(top_srcdir)/build-aux/depcomp
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+bin_PROGRAMS = gpg2$(EXEEXT) $(am__EXEEXT_1)
+ at HAVE_W32CE_SYSTEM_FALSE@am__append_8 = gpgv2
+noinst_PROGRAMS = $(am__EXEEXT_2)
+TESTS = $(am__EXEEXT_2)
+ at HAVE_W32_SYSTEM_TRUE@am__append_9 = gpg-w32info.o
+subdir = g10
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = gpg.w32-manifest
+CONFIG_CLEAN_VPATH_FILES =
+ at HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_1 = gpgv2$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)"
- am__EXEEXT_2 = t-rmd160$(EXEEXT) t-keydb$(EXEEXT)
++am__EXEEXT_2 = t-rmd160$(EXEEXT) t-keydb$(EXEEXT) \
++ t-keydb-get-keyblock$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am__gpg2_SOURCES_DIST = gpg.c server.c gpg.h dek.h build-packet.c \
+ compress.c compress-bz2.c filter.h free-packet.c getkey.c \
+ keydb.c keydb.h keyring.c keyring.h seskey.c kbnode.c main.h \
+ mainproc.c armor.c mdfilter.c textfilter.c progress.c misc.c \
+ rmd160.c rmd160.h options.h openfile.c keyid.c packet.h \
+ parse-packet.c cpr.c plaintext.c sig-check.c keylist.c \
+ pkglue.c pkglue.h ecdh.c pkclist.c skclist.c pubkey-enc.c \
+ passphrase.c decrypt.c decrypt-data.c cipher.c encrypt.c \
+ sign.c verify.c revoke.c keyedit.c dearmor.c import.c export.c \
+ migrate.c delkey.c keygen.c helptext.c keyserver.c \
+ keyserver-internal.h call-dirmngr.c call-dirmngr.h photoid.c \
+ photoid.h call-agent.c call-agent.h trust.c trustdb.c \
- trustdb.h tdbdump.c tdbio.c tdbio.h card-util.c exec.c exec.h
++ trustdb.h tdbdump.c tdbio.c tdbio.h tofu.h tofu.c sqlite.c \
++ sqlite.h card-util.c exec.c exec.h
+ at ENABLE_BZIP2_SUPPORT_TRUE@am__objects_1 = compress-bz2.$(OBJEXT)
+am__objects_2 = build-packet.$(OBJEXT) compress.$(OBJEXT) \
+ $(am__objects_1) free-packet.$(OBJEXT) getkey.$(OBJEXT) \
+ keydb.$(OBJEXT) keyring.$(OBJEXT) seskey.$(OBJEXT) \
+ kbnode.$(OBJEXT) mainproc.$(OBJEXT) armor.$(OBJEXT) \
+ mdfilter.$(OBJEXT) textfilter.$(OBJEXT) progress.$(OBJEXT) \
+ misc.$(OBJEXT) rmd160.$(OBJEXT) openfile.$(OBJEXT) \
+ keyid.$(OBJEXT) parse-packet.$(OBJEXT) cpr.$(OBJEXT) \
+ plaintext.$(OBJEXT) sig-check.$(OBJEXT) keylist.$(OBJEXT) \
+ pkglue.$(OBJEXT) ecdh.$(OBJEXT)
+ at NO_TRUST_MODELS_FALSE@am__objects_3 = trustdb.$(OBJEXT) \
+ at NO_TRUST_MODELS_FALSE@ tdbdump.$(OBJEXT) tdbio.$(OBJEXT)
- @ENABLE_CARD_SUPPORT_TRUE at am__objects_4 = card-util.$(OBJEXT)
++ at USE_TOFU_TRUE@am__objects_4 = tofu.$(OBJEXT) sqlite.$(OBJEXT)
++ at ENABLE_CARD_SUPPORT_TRUE@am__objects_5 = card-util.$(OBJEXT)
+am_gpg2_OBJECTS = gpg.$(OBJEXT) server.$(OBJEXT) $(am__objects_2) \
+ pkclist.$(OBJEXT) skclist.$(OBJEXT) pubkey-enc.$(OBJEXT) \
+ passphrase.$(OBJEXT) decrypt.$(OBJEXT) decrypt-data.$(OBJEXT) \
+ cipher.$(OBJEXT) encrypt.$(OBJEXT) sign.$(OBJEXT) \
+ verify.$(OBJEXT) revoke.$(OBJEXT) keyedit.$(OBJEXT) \
+ dearmor.$(OBJEXT) import.$(OBJEXT) export.$(OBJEXT) \
+ migrate.$(OBJEXT) delkey.$(OBJEXT) keygen.$(OBJEXT) \
+ helptext.$(OBJEXT) keyserver.$(OBJEXT) call-dirmngr.$(OBJEXT) \
+ photoid.$(OBJEXT) call-agent.$(OBJEXT) trust.$(OBJEXT) \
- $(am__objects_3) $(am__objects_4) exec.$(OBJEXT)
++ $(am__objects_3) $(am__objects_4) $(am__objects_5) \
++ exec.$(OBJEXT)
+gpg2_OBJECTS = $(am_gpg2_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(needed_libs) ../common/libgpgrl.a \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+gpg2_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(resource_objs) \
- $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(resource_objs) $(am__DEPENDENCIES_1)
+gpg2_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpg2_LDFLAGS) $(LDFLAGS) \
+ -o $@
+am__gpgv2_SOURCES_DIST = gpgv.c gpg.h dek.h build-packet.c compress.c \
+ compress-bz2.c filter.h free-packet.c getkey.c keydb.c keydb.h \
+ keyring.c keyring.h seskey.c kbnode.c main.h mainproc.c \
+ armor.c mdfilter.c textfilter.c progress.c misc.c rmd160.c \
+ rmd160.h options.h openfile.c keyid.c packet.h parse-packet.c \
+ cpr.c plaintext.c sig-check.c keylist.c pkglue.c pkglue.h \
+ ecdh.c verify.c
+am_gpgv2_OBJECTS = gpgv.$(OBJEXT) $(am__objects_2) verify.$(OBJEXT)
+gpgv2_OBJECTS = $(am_gpgv2_OBJECTS)
+gpgv2_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(resource_objs) \
+ $(am__DEPENDENCIES_1)
+gpgv2_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgv2_LDFLAGS) \
+ $(LDFLAGS) -o $@
+am__t_keydb_SOURCES_DIST = t-keydb.c test-stubs.c gpg.h dek.h \
+ build-packet.c compress.c compress-bz2.c filter.h \
+ free-packet.c getkey.c keydb.c keydb.h keyring.c keyring.h \
+ seskey.c kbnode.c main.h mainproc.c armor.c mdfilter.c \
+ textfilter.c progress.c misc.c rmd160.c rmd160.h options.h \
+ openfile.c keyid.c packet.h parse-packet.c cpr.c plaintext.c \
+ sig-check.c keylist.c pkglue.c pkglue.h ecdh.c
+am_t_keydb_OBJECTS = t-keydb.$(OBJEXT) test-stubs.$(OBJEXT) \
+ $(am__objects_2)
+t_keydb_OBJECTS = $(am_t_keydb_OBJECTS)
+t_keydb_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
++am__t_keydb_get_keyblock_SOURCES_DIST = t-keydb-get-keyblock.c \
++ test-stubs.c gpg.h dek.h build-packet.c compress.c \
++ compress-bz2.c filter.h free-packet.c getkey.c keydb.c keydb.h \
++ keyring.c keyring.h seskey.c kbnode.c main.h mainproc.c \
++ armor.c mdfilter.c textfilter.c progress.c misc.c rmd160.c \
++ rmd160.h options.h openfile.c keyid.c packet.h parse-packet.c \
++ cpr.c plaintext.c sig-check.c keylist.c pkglue.c pkglue.h \
++ ecdh.c
++am_t_keydb_get_keyblock_OBJECTS = t-keydb-get-keyblock.$(OBJEXT) \
++ test-stubs.$(OBJEXT) $(am__objects_2)
++t_keydb_get_keyblock_OBJECTS = $(am_t_keydb_get_keyblock_OBJECTS)
++t_keydb_get_keyblock_DEPENDENCIES = $(am__DEPENDENCIES_2) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_t_rmd160_OBJECTS = t-rmd160.$(OBJEXT) rmd160.$(OBJEXT)
+t_rmd160_OBJECTS = $(am_t_rmd160_OBJECTS)
+t_rmd160_DEPENDENCIES = $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(gpg2_SOURCES) $(gpgv2_SOURCES) $(t_keydb_SOURCES) \
- $(t_rmd160_SOURCES)
++ $(t_keydb_get_keyblock_SOURCES) $(t_rmd160_SOURCES)
+DIST_SOURCES = $(am__gpg2_SOURCES_DIST) $(am__gpgv2_SOURCES_DIST) \
- $(am__t_keydb_SOURCES_DIST) $(t_rmd160_SOURCES)
++ $(am__t_keydb_SOURCES_DIST) \
++ $(am__t_keydb_get_keyblock_SOURCES_DIST) $(t_rmd160_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = options.skel dirmngr-conf.skel distsigkey.gpg \
+ ChangeLog-2011 gpg-w32info.rc \
- gpg.w32-manifest.in test.c t-keydb-keyring.kbx
++ gpg.w32-manifest.in test.c t-keydb-keyring.kbx \
++ t-keydb-get-keyblock.gpg
+
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
+ $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4) $(am__append_5) $(am__append_6) \
+ $(am__append_7)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs = $(am__append_9)
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
- AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \
++AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \
+ $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
+
+needed_libs = ../kbx/libkeybox.a $(libcommon)
+ at ENABLE_BZIP2_SUPPORT_FALSE@bzip2_source =
+ at ENABLE_BZIP2_SUPPORT_TRUE@bzip2_source = compress-bz2.c
+ at ENABLE_CARD_SUPPORT_FALSE@card_source =
+ at ENABLE_CARD_SUPPORT_TRUE@card_source = card-util.c
+ at NO_TRUST_MODELS_FALSE@trust_source = trustdb.c trustdb.h tdbdump.c tdbio.c tdbio.h
+ at NO_TRUST_MODELS_TRUE@trust_source =
++ at USE_TOFU_FALSE@tofu_source =
++ at USE_TOFU_TRUE@tofu_source = tofu.h tofu.c sqlite.c sqlite.h
+common_source = \
+ gpg.h \
+ dek.h \
+ build-packet.c \
+ compress.c \
+ $(bzip2_source) \
+ filter.h \
+ free-packet.c \
+ getkey.c \
+ keydb.c keydb.h \
+ keyring.c keyring.h \
+ seskey.c \
+ kbnode.c \
+ main.h \
+ mainproc.c \
+ armor.c \
+ mdfilter.c \
+ textfilter.c \
+ progress.c \
+ misc.c \
+ rmd160.c rmd160.h \
+ options.h \
+ openfile.c \
+ keyid.c \
+ packet.h \
+ parse-packet.c \
+ cpr.c \
+ plaintext.c \
+ sig-check.c \
+ keylist.c \
+ pkglue.c pkglue.h \
+ ecdh.c
+
+gpg2_SOURCES = gpg.c \
+ server.c \
+ $(common_source) \
+ pkclist.c \
+ skclist.c \
+ pubkey-enc.c \
+ passphrase.c \
+ decrypt.c \
+ decrypt-data.c \
+ cipher.c \
+ encrypt.c \
+ sign.c \
+ verify.c \
+ revoke.c \
+ keyedit.c \
+ dearmor.c \
+ import.c \
+ export.c \
+ migrate.c \
+ delkey.c \
+ keygen.c \
+ helptext.c \
+ keyserver.c \
+ keyserver-internal.h \
+ call-dirmngr.c call-dirmngr.h \
+ photoid.c photoid.h \
+ call-agent.c call-agent.h \
- trust.c $(trust_source) \
++ trust.c $(trust_source) $(tofu_source) \
+ $(card_source) \
+ exec.c exec.h
+
+gpgv2_SOURCES = gpgv.c \
+ $(common_source) \
+ verify.c
+
+
+#gpgd_SOURCES = gpgd.c \
+# ks-proto.h \
+# ks-proto.c \
+# ks-db.c \
+# ks-db.h \
+# $(common_source)
+LDADD = $(needed_libs) ../common/libgpgrl.a \
+ $(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
+
- gpg2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
++gpg2_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
+ $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
+ $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+
+gpg2_LDFLAGS = $(extra_bin_ldflags)
+gpgv2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
+ $(GPG_ERROR_LIBS) \
+ $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+
+gpgv2_LDFLAGS = $(extra_bin_ldflags)
+t_common_ldadd =
- module_tests = t-rmd160 t-keydb
++module_tests = t-rmd160 t-keydb t-keydb-get-keyblock
+t_rmd160_SOURCES = t-rmd160.c rmd160.c
+t_rmd160_LDADD = $(t_common_ldadd)
+t_keydb_SOURCES = t-keydb.c test-stubs.c $(common_source)
+t_keydb_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+ $(LIBICONV) $(t_common_ldadd)
+
++t_keydb_get_keyblock_SOURCES = t-keydb-get-keyblock.c test-stubs.c \
++ $(common_source)
++
++t_keydb_get_keyblock_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
++ $(LIBICONV) $(t_common_ldadd)
++
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu g10/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu g10/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+gpg.w32-manifest: $(top_builddir)/config.status $(srcdir)/gpg.w32-manifest.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+gpg2$(EXEEXT): $(gpg2_OBJECTS) $(gpg2_DEPENDENCIES) $(EXTRA_gpg2_DEPENDENCIES)
+ @rm -f gpg2$(EXEEXT)
+ $(AM_V_CCLD)$(gpg2_LINK) $(gpg2_OBJECTS) $(gpg2_LDADD) $(LIBS)
+
+gpgv2$(EXEEXT): $(gpgv2_OBJECTS) $(gpgv2_DEPENDENCIES) $(EXTRA_gpgv2_DEPENDENCIES)
+ @rm -f gpgv2$(EXEEXT)
+ $(AM_V_CCLD)$(gpgv2_LINK) $(gpgv2_OBJECTS) $(gpgv2_LDADD) $(LIBS)
+
+t-keydb$(EXEEXT): $(t_keydb_OBJECTS) $(t_keydb_DEPENDENCIES) $(EXTRA_t_keydb_DEPENDENCIES)
+ @rm -f t-keydb$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_keydb_OBJECTS) $(t_keydb_LDADD) $(LIBS)
+
++t-keydb-get-keyblock$(EXEEXT): $(t_keydb_get_keyblock_OBJECTS) $(t_keydb_get_keyblock_DEPENDENCIES) $(EXTRA_t_keydb_get_keyblock_DEPENDENCIES)
++ @rm -f t-keydb-get-keyblock$(EXEEXT)
++ $(AM_V_CCLD)$(LINK) $(t_keydb_get_keyblock_OBJECTS) $(t_keydb_get_keyblock_LDADD) $(LIBS)
++
+t-rmd160$(EXEEXT): $(t_rmd160_OBJECTS) $(t_rmd160_DEPENDENCIES) $(EXTRA_t_rmd160_DEPENDENCIES)
+ @rm -f t-rmd160$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_rmd160_OBJECTS) $(t_rmd160_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/armor.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/build-packet.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call-agent.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call-dirmngr.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/card-util.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cipher.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/compress-bz2.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/compress.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cpr.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dearmor.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/decrypt-data.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/decrypt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/delkey.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ecdh.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/encrypt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/exec.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/export.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/free-packet.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getkey.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgv.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/helptext.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/import.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbnode.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keydb.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keyedit.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keygen.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keyid.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keylist.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keyring.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keyserver.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mainproc.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mdfilter.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/migrate.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/misc.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/openfile.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parse-packet.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/passphrase.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/photoid.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pkclist.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pkglue.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plaintext.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/progress.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pubkey-enc.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/revoke.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rmd160.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seskey.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sig-check.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sign.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/skclist.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sqlite.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-keydb-get-keyblock.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-keydb.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-rmd160.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tdbdump.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tdbio.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test-stubs.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/textfilter.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tofu.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trust.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trustdb.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/verify.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ col=$$blu; res=SKIP; \
+ fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
+ All=""; \
+ else \
+ tests="tests"; \
+ All="All "; \
+ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="$$All$$all $$tests passed"; \
+ else \
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all $$tests failed"; \
+ else \
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ at HAVE_W32CE_SYSTEM_FALSE@install-exec-hook:
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-local
+
+.MAKE: check-am install-am install-exec-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+ clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-data-local install-dvi \
+ install-dvi-am install-exec install-exec-am install-exec-hook \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-local
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+ at HAVE_W32_SYSTEM_TRUE@gpg-w32info.o : gpg.w32-manifest
+
+$(PROGRAMS): $(needed_libs) ../common/libgpgrl.a
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ $(INSTALL_DATA) $(srcdir)/options.skel \
+ $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
+ $(INSTALL_DATA) $(srcdir)/dirmngr-conf.skel \
+ $(DESTDIR)$(pkgdatadir)/dirmngr-conf.skel
+ $(INSTALL_DATA) $(srcdir)/distsigkey.gpg \
+ $(DESTDIR)$(pkgdatadir)/distsigkey.gpg
+
+uninstall-local:
+ - at rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
+ - at rm $(DESTDIR)$(pkgdatadir)/dirmngr-conf.skel
+ - at rm $(DESTDIR)$(pkgdatadir)/distsigkey.gpg
+
+# There has never been a gpg for WindowsCE, thus we don't need a gpg2 here
+ at HAVE_W32CE_SYSTEM_TRUE@install-exec-hook:
+ at HAVE_W32CE_SYSTEM_TRUE@ mv -f $(DESTDIR)$(bindir)/gpg2$(EXEEXT) \
+ at HAVE_W32CE_SYSTEM_TRUE@ $(DESTDIR)$(bindir)/gpg$(EXEEXT)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc g13/Makefile.in
index dd3c489,0000000..6a7ca9e
mode 100644,000000..100644
--- a/g13/Makefile.in
+++ b/g13/Makefile.in
@@@ -1,773 -1,0 +1,773 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# g13/Makefile.am
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = g13$(EXEEXT)
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(top_srcdir)/build-aux/depcomp
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+subdir = g13
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_g13_OBJECTS = g13.$(OBJEXT) g13-common.$(OBJEXT) utils.$(OBJEXT) \
+ server.$(OBJEXT) create.$(OBJEXT) mount.$(OBJEXT) \
- mountinfo.$(OBJEXT) call-gpg.$(OBJEXT) runner.$(OBJEXT) \
- backend.$(OBJEXT) be-encfs.$(OBJEXT) be-truecrypt.$(OBJEXT)
++ mountinfo.$(OBJEXT) runner.$(OBJEXT) backend.$(OBJEXT) \
++ be-encfs.$(OBJEXT) be-truecrypt.$(OBJEXT)
+g13_OBJECTS = $(am_g13_OBJECTS)
+am__DEPENDENCIES_1 =
+g13_DEPENDENCIES = $(libcommonpth) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(g13_SOURCES)
+DIST_SOURCES = $(g13_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = ChangeLog-2011
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
+ $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4) $(am__append_5) $(am__append_6) \
+ $(am__append_7)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs =
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
+g13_SOURCES = \
+ g13.c g13.h \
+ g13-common.c g13-common.h \
+ keyblob.h \
+ utils.c utils.h \
+ server.c server.h \
+ create.c create.h \
+ mount.c mount.h \
+ mountinfo.c mountinfo.h \
- call-gpg.c call-gpg.h \
+ runner.c runner.h \
+ backend.c backend.h \
+ be-encfs.c be-encfs.h \
+ be-truecrypt.c be-truecrypt.h
+
+g13_LDADD = $(libcommonpth) \
+ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
+ $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu g13/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu g13/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+g13$(EXEEXT): $(g13_OBJECTS) $(g13_DEPENDENCIES) $(EXTRA_g13_DEPENDENCIES)
+ @rm -f g13$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(g13_OBJECTS) $(g13_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/backend.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/be-encfs.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/be-truecrypt.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call-gpg.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/create.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/g13-common.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/g13.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mountinfo.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/runner.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utils.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ distclean distclean-compile distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-binPROGRAMS install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc kbx/Makefile.in
index d18ff72,0000000..9968653
mode 100644,000000..100644
--- a/kbx/Makefile.in
+++ b/kbx/Makefile.in
@@@ -1,1203 -1,0 +1,1205 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Keybox Makefile
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(top_srcdir)/build-aux/depcomp
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+bin_PROGRAMS = kbxutil$(EXEEXT)
+subdir = kbx
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_ at AM_V@)
+am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
+am__v_AR_0 = @echo " AR " $@;
+am__v_AR_1 =
+libkeybox_a_AR = $(AR) $(ARFLAGS)
+libkeybox_a_LIBADD =
+am__objects_1 = libkeybox_a-keybox-util.$(OBJEXT) \
+ libkeybox_a-keybox-init.$(OBJEXT) \
+ libkeybox_a-keybox-blob.$(OBJEXT) \
+ libkeybox_a-keybox-file.$(OBJEXT) \
+ libkeybox_a-keybox-search.$(OBJEXT) \
+ libkeybox_a-keybox-update.$(OBJEXT) \
+ libkeybox_a-keybox-openpgp.$(OBJEXT) \
+ libkeybox_a-keybox-dump.$(OBJEXT)
+am_libkeybox_a_OBJECTS = $(am__objects_1)
+libkeybox_a_OBJECTS = $(am_libkeybox_a_OBJECTS)
+libkeybox509_a_AR = $(AR) $(ARFLAGS)
+libkeybox509_a_LIBADD =
+am__objects_2 = libkeybox509_a-keybox-util.$(OBJEXT) \
+ libkeybox509_a-keybox-init.$(OBJEXT) \
+ libkeybox509_a-keybox-blob.$(OBJEXT) \
+ libkeybox509_a-keybox-file.$(OBJEXT) \
+ libkeybox509_a-keybox-search.$(OBJEXT) \
+ libkeybox509_a-keybox-update.$(OBJEXT) \
+ libkeybox509_a-keybox-openpgp.$(OBJEXT) \
+ libkeybox509_a-keybox-dump.$(OBJEXT)
+am_libkeybox509_a_OBJECTS = $(am__objects_2)
+libkeybox509_a_OBJECTS = $(am_libkeybox509_a_OBJECTS)
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am__objects_3 = kbxutil-keybox-util.$(OBJEXT) \
+ kbxutil-keybox-init.$(OBJEXT) kbxutil-keybox-blob.$(OBJEXT) \
+ kbxutil-keybox-file.$(OBJEXT) kbxutil-keybox-search.$(OBJEXT) \
+ kbxutil-keybox-update.$(OBJEXT) \
+ kbxutil-keybox-openpgp.$(OBJEXT) kbxutil-keybox-dump.$(OBJEXT)
+am_kbxutil_OBJECTS = kbxutil-kbxutil.$(OBJEXT) $(am__objects_3)
+kbxutil_OBJECTS = $(am_kbxutil_OBJECTS)
+am__DEPENDENCIES_1 =
+ at HAVE_W32CE_SYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+kbxutil_DEPENDENCIES = ../common/libcommon.a $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+kbxutil_LINK = $(CCLD) $(kbxutil_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(libkeybox_a_SOURCES) $(libkeybox509_a_SOURCES) \
+ $(kbxutil_SOURCES)
+DIST_SOURCES = $(libkeybox_a_SOURCES) $(libkeybox509_a_SOURCES) \
+ $(kbxutil_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = mkerrors
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
+ $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4) $(am__append_5) $(am__append_6) \
+ $(am__append_7)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs =
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
+noinst_LIBRARIES = libkeybox.a libkeybox509.a
+ at HAVE_W32CE_SYSTEM_FALSE@extra_libs =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_libs = $(LIBASSUAN_LIBS)
+common_sources = \
+ keybox.h keybox-defs.h keybox-search-desc.h \
+ keybox-util.c \
+ keybox-init.c \
+ keybox-blob.c \
+ keybox-file.c \
+ keybox-search.c \
+ keybox-update.c \
+ keybox-openpgp.c \
+ keybox-dump.c
+
+libkeybox_a_SOURCES = $(common_sources)
+libkeybox509_a_SOURCES = $(common_sources)
+libkeybox_a_CFLAGS = $(AM_CFLAGS)
+libkeybox509_a_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
+
+# We need W32SOCKLIBS because the init subsystem code in libcommon
+# requires it - although we don't actually need it. It is easier
+# to do it this way.
+kbxutil_SOURCES = kbxutil.c $(common_sources)
+kbxutil_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
+kbxutil_LDADD = ../common/libcommon.a \
+ $(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
+ $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbx/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu kbx/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libkeybox.a: $(libkeybox_a_OBJECTS) $(libkeybox_a_DEPENDENCIES) $(EXTRA_libkeybox_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libkeybox.a
+ $(AM_V_AR)$(libkeybox_a_AR) libkeybox.a $(libkeybox_a_OBJECTS) $(libkeybox_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libkeybox.a
+
+libkeybox509.a: $(libkeybox509_a_OBJECTS) $(libkeybox509_a_DEPENDENCIES) $(EXTRA_libkeybox509_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libkeybox509.a
+ $(AM_V_AR)$(libkeybox509_a_AR) libkeybox509.a $(libkeybox509_a_OBJECTS) $(libkeybox509_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libkeybox509.a
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+kbxutil$(EXEEXT): $(kbxutil_OBJECTS) $(kbxutil_DEPENDENCIES) $(EXTRA_kbxutil_DEPENDENCIES)
+ @rm -f kbxutil$(EXEEXT)
+ $(AM_V_CCLD)$(kbxutil_LINK) $(kbxutil_OBJECTS) $(kbxutil_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbxutil-kbxutil.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbxutil-keybox-blob.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbxutil-keybox-dump.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbxutil-keybox-file.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbxutil-keybox-init.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbxutil-keybox-openpgp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbxutil-keybox-search.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbxutil-keybox-update.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kbxutil-keybox-util.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox509_a-keybox-blob.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox509_a-keybox-dump.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox509_a-keybox-file.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox509_a-keybox-init.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox509_a-keybox-openpgp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox509_a-keybox-search.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox509_a-keybox-update.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox509_a-keybox-util.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox_a-keybox-blob.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox_a-keybox-dump.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox_a-keybox-file.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox_a-keybox-init.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox_a-keybox-openpgp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox_a-keybox-search.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox_a-keybox-update.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkeybox_a-keybox-util.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+libkeybox_a-keybox-util.o: keybox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-util.o -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-util.Tpo -c -o libkeybox_a-keybox-util.o `test -f 'keybox-util.c' || echo '$(srcdir)/'`keybox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-util.Tpo $(DEPDIR)/libkeybox_a-keybox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-util.c' object='libkeybox_a-keybox-util.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-util.o `test -f 'keybox-util.c' || echo '$(srcdir)/'`keybox-util.c
+
+libkeybox_a-keybox-util.obj: keybox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-util.obj -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-util.Tpo -c -o libkeybox_a-keybox-util.obj `if test -f 'keybox-util.c'; then $(CYGPATH_W) 'keybox-util.c'; else $(CYGPATH_W) '$(srcdir)/keybox-util.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-util.Tpo $(DEPDIR)/libkeybox_a-keybox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-util.c' object='libkeybox_a-keybox-util.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-util.obj `if test -f 'keybox-util.c'; then $(CYGPATH_W) 'keybox-util.c'; else $(CYGPATH_W) '$(srcdir)/keybox-util.c'; fi`
+
+libkeybox_a-keybox-init.o: keybox-init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-init.o -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-init.Tpo -c -o libkeybox_a-keybox-init.o `test -f 'keybox-init.c' || echo '$(srcdir)/'`keybox-init.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-init.Tpo $(DEPDIR)/libkeybox_a-keybox-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-init.c' object='libkeybox_a-keybox-init.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-init.o `test -f 'keybox-init.c' || echo '$(srcdir)/'`keybox-init.c
+
+libkeybox_a-keybox-init.obj: keybox-init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-init.obj -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-init.Tpo -c -o libkeybox_a-keybox-init.obj `if test -f 'keybox-init.c'; then $(CYGPATH_W) 'keybox-init.c'; else $(CYGPATH_W) '$(srcdir)/keybox-init.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-init.Tpo $(DEPDIR)/libkeybox_a-keybox-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-init.c' object='libkeybox_a-keybox-init.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-init.obj `if test -f 'keybox-init.c'; then $(CYGPATH_W) 'keybox-init.c'; else $(CYGPATH_W) '$(srcdir)/keybox-init.c'; fi`
+
+libkeybox_a-keybox-blob.o: keybox-blob.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-blob.o -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-blob.Tpo -c -o libkeybox_a-keybox-blob.o `test -f 'keybox-blob.c' || echo '$(srcdir)/'`keybox-blob.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-blob.Tpo $(DEPDIR)/libkeybox_a-keybox-blob.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-blob.c' object='libkeybox_a-keybox-blob.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-blob.o `test -f 'keybox-blob.c' || echo '$(srcdir)/'`keybox-blob.c
+
+libkeybox_a-keybox-blob.obj: keybox-blob.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-blob.obj -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-blob.Tpo -c -o libkeybox_a-keybox-blob.obj `if test -f 'keybox-blob.c'; then $(CYGPATH_W) 'keybox-blob.c'; else $(CYGPATH_W) '$(srcdir)/keybox-blob.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-blob.Tpo $(DEPDIR)/libkeybox_a-keybox-blob.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-blob.c' object='libkeybox_a-keybox-blob.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-blob.obj `if test -f 'keybox-blob.c'; then $(CYGPATH_W) 'keybox-blob.c'; else $(CYGPATH_W) '$(srcdir)/keybox-blob.c'; fi`
+
+libkeybox_a-keybox-file.o: keybox-file.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-file.o -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-file.Tpo -c -o libkeybox_a-keybox-file.o `test -f 'keybox-file.c' || echo '$(srcdir)/'`keybox-file.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-file.Tpo $(DEPDIR)/libkeybox_a-keybox-file.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-file.c' object='libkeybox_a-keybox-file.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-file.o `test -f 'keybox-file.c' || echo '$(srcdir)/'`keybox-file.c
+
+libkeybox_a-keybox-file.obj: keybox-file.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-file.obj -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-file.Tpo -c -o libkeybox_a-keybox-file.obj `if test -f 'keybox-file.c'; then $(CYGPATH_W) 'keybox-file.c'; else $(CYGPATH_W) '$(srcdir)/keybox-file.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-file.Tpo $(DEPDIR)/libkeybox_a-keybox-file.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-file.c' object='libkeybox_a-keybox-file.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-file.obj `if test -f 'keybox-file.c'; then $(CYGPATH_W) 'keybox-file.c'; else $(CYGPATH_W) '$(srcdir)/keybox-file.c'; fi`
+
+libkeybox_a-keybox-search.o: keybox-search.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-search.o -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-search.Tpo -c -o libkeybox_a-keybox-search.o `test -f 'keybox-search.c' || echo '$(srcdir)/'`keybox-search.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-search.Tpo $(DEPDIR)/libkeybox_a-keybox-search.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-search.c' object='libkeybox_a-keybox-search.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-search.o `test -f 'keybox-search.c' || echo '$(srcdir)/'`keybox-search.c
+
+libkeybox_a-keybox-search.obj: keybox-search.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-search.obj -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-search.Tpo -c -o libkeybox_a-keybox-search.obj `if test -f 'keybox-search.c'; then $(CYGPATH_W) 'keybox-search.c'; else $(CYGPATH_W) '$(srcdir)/keybox-search.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-search.Tpo $(DEPDIR)/libkeybox_a-keybox-search.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-search.c' object='libkeybox_a-keybox-search.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-search.obj `if test -f 'keybox-search.c'; then $(CYGPATH_W) 'keybox-search.c'; else $(CYGPATH_W) '$(srcdir)/keybox-search.c'; fi`
+
+libkeybox_a-keybox-update.o: keybox-update.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-update.o -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-update.Tpo -c -o libkeybox_a-keybox-update.o `test -f 'keybox-update.c' || echo '$(srcdir)/'`keybox-update.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-update.Tpo $(DEPDIR)/libkeybox_a-keybox-update.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-update.c' object='libkeybox_a-keybox-update.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-update.o `test -f 'keybox-update.c' || echo '$(srcdir)/'`keybox-update.c
+
+libkeybox_a-keybox-update.obj: keybox-update.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-update.obj -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-update.Tpo -c -o libkeybox_a-keybox-update.obj `if test -f 'keybox-update.c'; then $(CYGPATH_W) 'keybox-update.c'; else $(CYGPATH_W) '$(srcdir)/keybox-update.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-update.Tpo $(DEPDIR)/libkeybox_a-keybox-update.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-update.c' object='libkeybox_a-keybox-update.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-update.obj `if test -f 'keybox-update.c'; then $(CYGPATH_W) 'keybox-update.c'; else $(CYGPATH_W) '$(srcdir)/keybox-update.c'; fi`
+
+libkeybox_a-keybox-openpgp.o: keybox-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-openpgp.o -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-openpgp.Tpo -c -o libkeybox_a-keybox-openpgp.o `test -f 'keybox-openpgp.c' || echo '$(srcdir)/'`keybox-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-openpgp.Tpo $(DEPDIR)/libkeybox_a-keybox-openpgp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-openpgp.c' object='libkeybox_a-keybox-openpgp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-openpgp.o `test -f 'keybox-openpgp.c' || echo '$(srcdir)/'`keybox-openpgp.c
+
+libkeybox_a-keybox-openpgp.obj: keybox-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-openpgp.obj -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-openpgp.Tpo -c -o libkeybox_a-keybox-openpgp.obj `if test -f 'keybox-openpgp.c'; then $(CYGPATH_W) 'keybox-openpgp.c'; else $(CYGPATH_W) '$(srcdir)/keybox-openpgp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-openpgp.Tpo $(DEPDIR)/libkeybox_a-keybox-openpgp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-openpgp.c' object='libkeybox_a-keybox-openpgp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-openpgp.obj `if test -f 'keybox-openpgp.c'; then $(CYGPATH_W) 'keybox-openpgp.c'; else $(CYGPATH_W) '$(srcdir)/keybox-openpgp.c'; fi`
+
+libkeybox_a-keybox-dump.o: keybox-dump.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-dump.o -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-dump.Tpo -c -o libkeybox_a-keybox-dump.o `test -f 'keybox-dump.c' || echo '$(srcdir)/'`keybox-dump.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-dump.Tpo $(DEPDIR)/libkeybox_a-keybox-dump.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-dump.c' object='libkeybox_a-keybox-dump.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-dump.o `test -f 'keybox-dump.c' || echo '$(srcdir)/'`keybox-dump.c
+
+libkeybox_a-keybox-dump.obj: keybox-dump.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -MT libkeybox_a-keybox-dump.obj -MD -MP -MF $(DEPDIR)/libkeybox_a-keybox-dump.Tpo -c -o libkeybox_a-keybox-dump.obj `if test -f 'keybox-dump.c'; then $(CYGPATH_W) 'keybox-dump.c'; else $(CYGPATH_W) '$(srcdir)/keybox-dump.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox_a-keybox-dump.Tpo $(DEPDIR)/libkeybox_a-keybox-dump.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-dump.c' object='libkeybox_a-keybox-dump.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox_a_CFLAGS) $(CFLAGS) -c -o libkeybox_a-keybox-dump.obj `if test -f 'keybox-dump.c'; then $(CYGPATH_W) 'keybox-dump.c'; else $(CYGPATH_W) '$(srcdir)/keybox-dump.c'; fi`
+
+libkeybox509_a-keybox-util.o: keybox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-util.o -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-util.Tpo -c -o libkeybox509_a-keybox-util.o `test -f 'keybox-util.c' || echo '$(srcdir)/'`keybox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-util.Tpo $(DEPDIR)/libkeybox509_a-keybox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-util.c' object='libkeybox509_a-keybox-util.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-util.o `test -f 'keybox-util.c' || echo '$(srcdir)/'`keybox-util.c
+
+libkeybox509_a-keybox-util.obj: keybox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-util.obj -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-util.Tpo -c -o libkeybox509_a-keybox-util.obj `if test -f 'keybox-util.c'; then $(CYGPATH_W) 'keybox-util.c'; else $(CYGPATH_W) '$(srcdir)/keybox-util.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-util.Tpo $(DEPDIR)/libkeybox509_a-keybox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-util.c' object='libkeybox509_a-keybox-util.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-util.obj `if test -f 'keybox-util.c'; then $(CYGPATH_W) 'keybox-util.c'; else $(CYGPATH_W) '$(srcdir)/keybox-util.c'; fi`
+
+libkeybox509_a-keybox-init.o: keybox-init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-init.o -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-init.Tpo -c -o libkeybox509_a-keybox-init.o `test -f 'keybox-init.c' || echo '$(srcdir)/'`keybox-init.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-init.Tpo $(DEPDIR)/libkeybox509_a-keybox-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-init.c' object='libkeybox509_a-keybox-init.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-init.o `test -f 'keybox-init.c' || echo '$(srcdir)/'`keybox-init.c
+
+libkeybox509_a-keybox-init.obj: keybox-init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-init.obj -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-init.Tpo -c -o libkeybox509_a-keybox-init.obj `if test -f 'keybox-init.c'; then $(CYGPATH_W) 'keybox-init.c'; else $(CYGPATH_W) '$(srcdir)/keybox-init.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-init.Tpo $(DEPDIR)/libkeybox509_a-keybox-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-init.c' object='libkeybox509_a-keybox-init.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-init.obj `if test -f 'keybox-init.c'; then $(CYGPATH_W) 'keybox-init.c'; else $(CYGPATH_W) '$(srcdir)/keybox-init.c'; fi`
+
+libkeybox509_a-keybox-blob.o: keybox-blob.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-blob.o -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-blob.Tpo -c -o libkeybox509_a-keybox-blob.o `test -f 'keybox-blob.c' || echo '$(srcdir)/'`keybox-blob.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-blob.Tpo $(DEPDIR)/libkeybox509_a-keybox-blob.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-blob.c' object='libkeybox509_a-keybox-blob.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-blob.o `test -f 'keybox-blob.c' || echo '$(srcdir)/'`keybox-blob.c
+
+libkeybox509_a-keybox-blob.obj: keybox-blob.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-blob.obj -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-blob.Tpo -c -o libkeybox509_a-keybox-blob.obj `if test -f 'keybox-blob.c'; then $(CYGPATH_W) 'keybox-blob.c'; else $(CYGPATH_W) '$(srcdir)/keybox-blob.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-blob.Tpo $(DEPDIR)/libkeybox509_a-keybox-blob.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-blob.c' object='libkeybox509_a-keybox-blob.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-blob.obj `if test -f 'keybox-blob.c'; then $(CYGPATH_W) 'keybox-blob.c'; else $(CYGPATH_W) '$(srcdir)/keybox-blob.c'; fi`
+
+libkeybox509_a-keybox-file.o: keybox-file.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-file.o -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-file.Tpo -c -o libkeybox509_a-keybox-file.o `test -f 'keybox-file.c' || echo '$(srcdir)/'`keybox-file.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-file.Tpo $(DEPDIR)/libkeybox509_a-keybox-file.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-file.c' object='libkeybox509_a-keybox-file.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-file.o `test -f 'keybox-file.c' || echo '$(srcdir)/'`keybox-file.c
+
+libkeybox509_a-keybox-file.obj: keybox-file.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-file.obj -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-file.Tpo -c -o libkeybox509_a-keybox-file.obj `if test -f 'keybox-file.c'; then $(CYGPATH_W) 'keybox-file.c'; else $(CYGPATH_W) '$(srcdir)/keybox-file.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-file.Tpo $(DEPDIR)/libkeybox509_a-keybox-file.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-file.c' object='libkeybox509_a-keybox-file.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-file.obj `if test -f 'keybox-file.c'; then $(CYGPATH_W) 'keybox-file.c'; else $(CYGPATH_W) '$(srcdir)/keybox-file.c'; fi`
+
+libkeybox509_a-keybox-search.o: keybox-search.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-search.o -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-search.Tpo -c -o libkeybox509_a-keybox-search.o `test -f 'keybox-search.c' || echo '$(srcdir)/'`keybox-search.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-search.Tpo $(DEPDIR)/libkeybox509_a-keybox-search.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-search.c' object='libkeybox509_a-keybox-search.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-search.o `test -f 'keybox-search.c' || echo '$(srcdir)/'`keybox-search.c
+
+libkeybox509_a-keybox-search.obj: keybox-search.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-search.obj -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-search.Tpo -c -o libkeybox509_a-keybox-search.obj `if test -f 'keybox-search.c'; then $(CYGPATH_W) 'keybox-search.c'; else $(CYGPATH_W) '$(srcdir)/keybox-search.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-search.Tpo $(DEPDIR)/libkeybox509_a-keybox-search.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-search.c' object='libkeybox509_a-keybox-search.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-search.obj `if test -f 'keybox-search.c'; then $(CYGPATH_W) 'keybox-search.c'; else $(CYGPATH_W) '$(srcdir)/keybox-search.c'; fi`
+
+libkeybox509_a-keybox-update.o: keybox-update.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-update.o -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-update.Tpo -c -o libkeybox509_a-keybox-update.o `test -f 'keybox-update.c' || echo '$(srcdir)/'`keybox-update.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-update.Tpo $(DEPDIR)/libkeybox509_a-keybox-update.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-update.c' object='libkeybox509_a-keybox-update.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-update.o `test -f 'keybox-update.c' || echo '$(srcdir)/'`keybox-update.c
+
+libkeybox509_a-keybox-update.obj: keybox-update.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-update.obj -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-update.Tpo -c -o libkeybox509_a-keybox-update.obj `if test -f 'keybox-update.c'; then $(CYGPATH_W) 'keybox-update.c'; else $(CYGPATH_W) '$(srcdir)/keybox-update.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-update.Tpo $(DEPDIR)/libkeybox509_a-keybox-update.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-update.c' object='libkeybox509_a-keybox-update.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-update.obj `if test -f 'keybox-update.c'; then $(CYGPATH_W) 'keybox-update.c'; else $(CYGPATH_W) '$(srcdir)/keybox-update.c'; fi`
+
+libkeybox509_a-keybox-openpgp.o: keybox-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-openpgp.o -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-openpgp.Tpo -c -o libkeybox509_a-keybox-openpgp.o `test -f 'keybox-openpgp.c' || echo '$(srcdir)/'`keybox-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-openpgp.Tpo $(DEPDIR)/libkeybox509_a-keybox-openpgp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-openpgp.c' object='libkeybox509_a-keybox-openpgp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-openpgp.o `test -f 'keybox-openpgp.c' || echo '$(srcdir)/'`keybox-openpgp.c
+
+libkeybox509_a-keybox-openpgp.obj: keybox-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-openpgp.obj -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-openpgp.Tpo -c -o libkeybox509_a-keybox-openpgp.obj `if test -f 'keybox-openpgp.c'; then $(CYGPATH_W) 'keybox-openpgp.c'; else $(CYGPATH_W) '$(srcdir)/keybox-openpgp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-openpgp.Tpo $(DEPDIR)/libkeybox509_a-keybox-openpgp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-openpgp.c' object='libkeybox509_a-keybox-openpgp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-openpgp.obj `if test -f 'keybox-openpgp.c'; then $(CYGPATH_W) 'keybox-openpgp.c'; else $(CYGPATH_W) '$(srcdir)/keybox-openpgp.c'; fi`
+
+libkeybox509_a-keybox-dump.o: keybox-dump.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-dump.o -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-dump.Tpo -c -o libkeybox509_a-keybox-dump.o `test -f 'keybox-dump.c' || echo '$(srcdir)/'`keybox-dump.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-dump.Tpo $(DEPDIR)/libkeybox509_a-keybox-dump.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-dump.c' object='libkeybox509_a-keybox-dump.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-dump.o `test -f 'keybox-dump.c' || echo '$(srcdir)/'`keybox-dump.c
+
+libkeybox509_a-keybox-dump.obj: keybox-dump.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -MT libkeybox509_a-keybox-dump.obj -MD -MP -MF $(DEPDIR)/libkeybox509_a-keybox-dump.Tpo -c -o libkeybox509_a-keybox-dump.obj `if test -f 'keybox-dump.c'; then $(CYGPATH_W) 'keybox-dump.c'; else $(CYGPATH_W) '$(srcdir)/keybox-dump.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeybox509_a-keybox-dump.Tpo $(DEPDIR)/libkeybox509_a-keybox-dump.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-dump.c' object='libkeybox509_a-keybox-dump.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeybox509_a_CFLAGS) $(CFLAGS) -c -o libkeybox509_a-keybox-dump.obj `if test -f 'keybox-dump.c'; then $(CYGPATH_W) 'keybox-dump.c'; else $(CYGPATH_W) '$(srcdir)/keybox-dump.c'; fi`
+
+kbxutil-kbxutil.o: kbxutil.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-kbxutil.o -MD -MP -MF $(DEPDIR)/kbxutil-kbxutil.Tpo -c -o kbxutil-kbxutil.o `test -f 'kbxutil.c' || echo '$(srcdir)/'`kbxutil.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-kbxutil.Tpo $(DEPDIR)/kbxutil-kbxutil.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kbxutil.c' object='kbxutil-kbxutil.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-kbxutil.o `test -f 'kbxutil.c' || echo '$(srcdir)/'`kbxutil.c
+
+kbxutil-kbxutil.obj: kbxutil.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-kbxutil.obj -MD -MP -MF $(DEPDIR)/kbxutil-kbxutil.Tpo -c -o kbxutil-kbxutil.obj `if test -f 'kbxutil.c'; then $(CYGPATH_W) 'kbxutil.c'; else $(CYGPATH_W) '$(srcdir)/kbxutil.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-kbxutil.Tpo $(DEPDIR)/kbxutil-kbxutil.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kbxutil.c' object='kbxutil-kbxutil.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-kbxutil.obj `if test -f 'kbxutil.c'; then $(CYGPATH_W) 'kbxutil.c'; else $(CYGPATH_W) '$(srcdir)/kbxutil.c'; fi`
+
+kbxutil-keybox-util.o: keybox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-util.o -MD -MP -MF $(DEPDIR)/kbxutil-keybox-util.Tpo -c -o kbxutil-keybox-util.o `test -f 'keybox-util.c' || echo '$(srcdir)/'`keybox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-util.Tpo $(DEPDIR)/kbxutil-keybox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-util.c' object='kbxutil-keybox-util.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-util.o `test -f 'keybox-util.c' || echo '$(srcdir)/'`keybox-util.c
+
+kbxutil-keybox-util.obj: keybox-util.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-util.obj -MD -MP -MF $(DEPDIR)/kbxutil-keybox-util.Tpo -c -o kbxutil-keybox-util.obj `if test -f 'keybox-util.c'; then $(CYGPATH_W) 'keybox-util.c'; else $(CYGPATH_W) '$(srcdir)/keybox-util.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-util.Tpo $(DEPDIR)/kbxutil-keybox-util.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-util.c' object='kbxutil-keybox-util.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-util.obj `if test -f 'keybox-util.c'; then $(CYGPATH_W) 'keybox-util.c'; else $(CYGPATH_W) '$(srcdir)/keybox-util.c'; fi`
+
+kbxutil-keybox-init.o: keybox-init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-init.o -MD -MP -MF $(DEPDIR)/kbxutil-keybox-init.Tpo -c -o kbxutil-keybox-init.o `test -f 'keybox-init.c' || echo '$(srcdir)/'`keybox-init.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-init.Tpo $(DEPDIR)/kbxutil-keybox-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-init.c' object='kbxutil-keybox-init.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-init.o `test -f 'keybox-init.c' || echo '$(srcdir)/'`keybox-init.c
+
+kbxutil-keybox-init.obj: keybox-init.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-init.obj -MD -MP -MF $(DEPDIR)/kbxutil-keybox-init.Tpo -c -o kbxutil-keybox-init.obj `if test -f 'keybox-init.c'; then $(CYGPATH_W) 'keybox-init.c'; else $(CYGPATH_W) '$(srcdir)/keybox-init.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-init.Tpo $(DEPDIR)/kbxutil-keybox-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-init.c' object='kbxutil-keybox-init.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-init.obj `if test -f 'keybox-init.c'; then $(CYGPATH_W) 'keybox-init.c'; else $(CYGPATH_W) '$(srcdir)/keybox-init.c'; fi`
+
+kbxutil-keybox-blob.o: keybox-blob.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-blob.o -MD -MP -MF $(DEPDIR)/kbxutil-keybox-blob.Tpo -c -o kbxutil-keybox-blob.o `test -f 'keybox-blob.c' || echo '$(srcdir)/'`keybox-blob.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-blob.Tpo $(DEPDIR)/kbxutil-keybox-blob.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-blob.c' object='kbxutil-keybox-blob.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-blob.o `test -f 'keybox-blob.c' || echo '$(srcdir)/'`keybox-blob.c
+
+kbxutil-keybox-blob.obj: keybox-blob.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-blob.obj -MD -MP -MF $(DEPDIR)/kbxutil-keybox-blob.Tpo -c -o kbxutil-keybox-blob.obj `if test -f 'keybox-blob.c'; then $(CYGPATH_W) 'keybox-blob.c'; else $(CYGPATH_W) '$(srcdir)/keybox-blob.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-blob.Tpo $(DEPDIR)/kbxutil-keybox-blob.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-blob.c' object='kbxutil-keybox-blob.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-blob.obj `if test -f 'keybox-blob.c'; then $(CYGPATH_W) 'keybox-blob.c'; else $(CYGPATH_W) '$(srcdir)/keybox-blob.c'; fi`
+
+kbxutil-keybox-file.o: keybox-file.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-file.o -MD -MP -MF $(DEPDIR)/kbxutil-keybox-file.Tpo -c -o kbxutil-keybox-file.o `test -f 'keybox-file.c' || echo '$(srcdir)/'`keybox-file.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-file.Tpo $(DEPDIR)/kbxutil-keybox-file.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-file.c' object='kbxutil-keybox-file.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-file.o `test -f 'keybox-file.c' || echo '$(srcdir)/'`keybox-file.c
+
+kbxutil-keybox-file.obj: keybox-file.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-file.obj -MD -MP -MF $(DEPDIR)/kbxutil-keybox-file.Tpo -c -o kbxutil-keybox-file.obj `if test -f 'keybox-file.c'; then $(CYGPATH_W) 'keybox-file.c'; else $(CYGPATH_W) '$(srcdir)/keybox-file.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-file.Tpo $(DEPDIR)/kbxutil-keybox-file.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-file.c' object='kbxutil-keybox-file.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-file.obj `if test -f 'keybox-file.c'; then $(CYGPATH_W) 'keybox-file.c'; else $(CYGPATH_W) '$(srcdir)/keybox-file.c'; fi`
+
+kbxutil-keybox-search.o: keybox-search.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-search.o -MD -MP -MF $(DEPDIR)/kbxutil-keybox-search.Tpo -c -o kbxutil-keybox-search.o `test -f 'keybox-search.c' || echo '$(srcdir)/'`keybox-search.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-search.Tpo $(DEPDIR)/kbxutil-keybox-search.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-search.c' object='kbxutil-keybox-search.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-search.o `test -f 'keybox-search.c' || echo '$(srcdir)/'`keybox-search.c
+
+kbxutil-keybox-search.obj: keybox-search.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-search.obj -MD -MP -MF $(DEPDIR)/kbxutil-keybox-search.Tpo -c -o kbxutil-keybox-search.obj `if test -f 'keybox-search.c'; then $(CYGPATH_W) 'keybox-search.c'; else $(CYGPATH_W) '$(srcdir)/keybox-search.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-search.Tpo $(DEPDIR)/kbxutil-keybox-search.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-search.c' object='kbxutil-keybox-search.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-search.obj `if test -f 'keybox-search.c'; then $(CYGPATH_W) 'keybox-search.c'; else $(CYGPATH_W) '$(srcdir)/keybox-search.c'; fi`
+
+kbxutil-keybox-update.o: keybox-update.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-update.o -MD -MP -MF $(DEPDIR)/kbxutil-keybox-update.Tpo -c -o kbxutil-keybox-update.o `test -f 'keybox-update.c' || echo '$(srcdir)/'`keybox-update.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-update.Tpo $(DEPDIR)/kbxutil-keybox-update.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-update.c' object='kbxutil-keybox-update.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-update.o `test -f 'keybox-update.c' || echo '$(srcdir)/'`keybox-update.c
+
+kbxutil-keybox-update.obj: keybox-update.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-update.obj -MD -MP -MF $(DEPDIR)/kbxutil-keybox-update.Tpo -c -o kbxutil-keybox-update.obj `if test -f 'keybox-update.c'; then $(CYGPATH_W) 'keybox-update.c'; else $(CYGPATH_W) '$(srcdir)/keybox-update.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-update.Tpo $(DEPDIR)/kbxutil-keybox-update.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-update.c' object='kbxutil-keybox-update.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-update.obj `if test -f 'keybox-update.c'; then $(CYGPATH_W) 'keybox-update.c'; else $(CYGPATH_W) '$(srcdir)/keybox-update.c'; fi`
+
+kbxutil-keybox-openpgp.o: keybox-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-openpgp.o -MD -MP -MF $(DEPDIR)/kbxutil-keybox-openpgp.Tpo -c -o kbxutil-keybox-openpgp.o `test -f 'keybox-openpgp.c' || echo '$(srcdir)/'`keybox-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-openpgp.Tpo $(DEPDIR)/kbxutil-keybox-openpgp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-openpgp.c' object='kbxutil-keybox-openpgp.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-openpgp.o `test -f 'keybox-openpgp.c' || echo '$(srcdir)/'`keybox-openpgp.c
+
+kbxutil-keybox-openpgp.obj: keybox-openpgp.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-openpgp.obj -MD -MP -MF $(DEPDIR)/kbxutil-keybox-openpgp.Tpo -c -o kbxutil-keybox-openpgp.obj `if test -f 'keybox-openpgp.c'; then $(CYGPATH_W) 'keybox-openpgp.c'; else $(CYGPATH_W) '$(srcdir)/keybox-openpgp.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-openpgp.Tpo $(DEPDIR)/kbxutil-keybox-openpgp.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-openpgp.c' object='kbxutil-keybox-openpgp.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-openpgp.obj `if test -f 'keybox-openpgp.c'; then $(CYGPATH_W) 'keybox-openpgp.c'; else $(CYGPATH_W) '$(srcdir)/keybox-openpgp.c'; fi`
+
+kbxutil-keybox-dump.o: keybox-dump.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-dump.o -MD -MP -MF $(DEPDIR)/kbxutil-keybox-dump.Tpo -c -o kbxutil-keybox-dump.o `test -f 'keybox-dump.c' || echo '$(srcdir)/'`keybox-dump.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-dump.Tpo $(DEPDIR)/kbxutil-keybox-dump.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-dump.c' object='kbxutil-keybox-dump.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-dump.o `test -f 'keybox-dump.c' || echo '$(srcdir)/'`keybox-dump.c
+
+kbxutil-keybox-dump.obj: keybox-dump.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -MT kbxutil-keybox-dump.obj -MD -MP -MF $(DEPDIR)/kbxutil-keybox-dump.Tpo -c -o kbxutil-keybox-dump.obj `if test -f 'keybox-dump.c'; then $(CYGPATH_W) 'keybox-dump.c'; else $(CYGPATH_W) '$(srcdir)/keybox-dump.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kbxutil-keybox-dump.Tpo $(DEPDIR)/kbxutil-keybox-dump.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keybox-dump.c' object='kbxutil-keybox-dump.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kbxutil_CFLAGS) $(CFLAGS) -c -o kbxutil-keybox-dump.obj `if test -f 'keybox-dump.c'; then $(CYGPATH_W) 'keybox-dump.c'; else $(CYGPATH_W) '$(srcdir)/keybox-dump.c'; fi`
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES) $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+$(PROGRAMS) : ../common/libcommon.a
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc m4/Makefile.in
index cda871f,0000000..dcd9eae
mode 100644,000000..100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@@ -1,496 -1,0 +1,498 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = m4
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/build-aux/mkinstalldirs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = intl.m4 intldir.m4 glibc2.m4 lock.m4 visibility.m4 \
+ intmax.m4 longdouble.m4 printf-posix.m4 signed.m4 size_max.m4 \
+ wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 \
+ iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 \
+ isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+ progtest.m4 stdint_h.m4 uintmax_t.m4 ldap.m4 libcurl.m4 \
+ libusb.m4 tar-ustar.m4 readline.m4 gnupg-pth.m4 gpg-error.m4 \
+ libgcrypt.m4 libassuan.m4 ksba.m4 ntbtls.m4 autobuild.m4 \
+ sys_socket_h.m4 socklen.m4 ChangeLog-2011
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu m4/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc po/ca.gmo
index 6955c72,0000000..90769bd
mode 100644,000000..100644
Binary files differ
diff --cc po/ca.po
index c24f8f3,8f35c3b..da3517c
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
"Language-Team: Catalan <ca at dodds.net>\n"
@@@ -89,7 -78,6 +89,7 @@@ msgstr "la contrasenya és invàlida
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -99,75 -87,59 +99,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "la contrasenya és errònia"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "la línia és massa llarga\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "la contrasenya és massa llarga\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "l'MPI és erroni"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "la contrasenya és errònia"
@@@ -177,25 -148,11 +177,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -270,11 -214,9 +270,11 @@@ msgstr "Introduïu la contrasenya; aque
msgid "failed to create stream from socket: %s\n"
msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -418,43 -334,29 +418,43 @@@ msgstr "
"Opcions:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detall"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "una mica més silenciós"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -545,11 -430,6 +545,11 @@@ msgstr "no és suportat
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -565,145 -443,107 +565,144 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Certificat de revocació vàlid"
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "error en crear «%s»: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: s'ha creat el directori\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, 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:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@@ -719,8 -557,6 +718,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -728,9 -564,6 +727,9 @@@ msgstr "
"@Ordres:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -784,7 -609,6 +783,7 @@@ msgstr "Cancel·la
msgid "error while asking for the passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -969,8 -759,6 +968,8 @@@ msgstr "error en la creació de la cont
msgid "error creating a stream for a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -1126,7 -882,6 +1125,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1147,7 -899,6 +1146,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1462,7 -1153,6 +1461,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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "no forçat"
@@@ -1649,21 -1301,16 +1648,21 @@@ msgstr "no s'ha pogut posar «%s» en l
msgid "Enter passphrase: "
msgstr "Introduïu la contrasenya: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "la clau secreta no està disponible"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
# Destès? ivb
# Desatès, sí. jm
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "no es pot fet això en mode desatès\n"
@@@ -1679,26 -1324,18 +1678,26 @@@ msgstr "Aquesta ordre no està permesa
msgid "Reset Code not or not anymore available\n"
msgstr "parts de la clau secreta no estan disponbles\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "La vostra selecció? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[no establert]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "home"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "dóna"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "no especificat"
@@@ -1706,195 -1343,152 +1705,195 @@@
# Probablement és una clau, femení. jm
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "no forçat"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "forçat"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "no hi ha cap clau pública corresponent: %s\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "preferències actualitzades"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "Empremta digital:"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "no s'han trobat dades OpenPGP vàlides.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrodonida fins a %u bits\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1902,154 -1496,119 +1901,154 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr ""
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "La selecció és invàlida.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Seleccioneu la raó de la revocació:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Signar realment? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "ix del menú"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "les ordres entren en conflicte\n"
# «pantalla» o «ajuda»? ivb
# «ajuda», evidentment. jm
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "mostra aquesta ajuda"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "La clau és disponible en: "
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "canvia la data de caducitat"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "canvia la confiança"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "mostra empremta"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "genera un nou parell de claus"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr ""
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr ""
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "L'ordre no és vàlida (proveu «help»)\n"
@@@ -2057,80 -1615,66 +2056,86 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona per a aquesta ordre\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, 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:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "no s'ha trobat la clau «%s»: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n"
# Ahà! Abans «batch» està tal qual. Cal unificar. ivb
# Fet. jm
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "no es pot fer això en el mode desatès sense «--yes»\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Voleu esborrar aquesta clau de l'anell? "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "És una clau secreta! Voleu esborrar-la? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "clau"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Clau pública: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "s'ha netejat la informació de la confiança\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
@@@ -2184,7 -1720,6 +2189,7 @@@ msgid "forcing symmetric cipher %s (%d
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
@@@ -2276,293 -1795,246 +2281,313 @@@ msgstr "AVÍS: no s'ha pogut eliminar e
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"La signatura es marcarà com a irrevocable.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "la clau secreta és inusable"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr ""
"clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
"descarta\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: es descarta: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "AVÍS: no s'ha exportat res\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[No s'ha trobat l'id d'usuari]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "Empremta digital:"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "opcions d'importació no vàlides\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NOM|usa NOM com a clau secreta predeterminada"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "|[fitxer]|crea una signatura"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "crea una signatura separada"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "xifra dades"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "xifra només amb xifratge simètric"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "verifica una signatura"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "llista claus"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "llista claus i signatures"
# «de les claus» o «de la clau»? ivb
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "comprova les signatures de la claus"
# «dactilars» o «digitals»? ivb
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "llista claus secretes"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "genera un certificat de revocació"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "elimina claus de l'anell públic"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "elimina claus de l'anell secret"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "signa o edita una clau"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "canvia la contrasenya"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "exporta claus"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "exporta claus a un servidor de claus"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importa claus d'un servidor de claus"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "cerca claus en un servidor de claus"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "actualitza totes les claus des d'un servidor de claus"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importa/fon claus"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "actualitza la base de dades de confiança"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOM|xifra per a NOM"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa aquest id per a signar o desxifrar"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivell de compressió N (0 no comprimeix)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "usa el mode de text canònic"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "no fa cap canvi"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "pregunta abans de sobreescriure"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2573,7 -2045,6 +2598,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:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2593,13 -2064,11 +2618,13 @@@ msgstr "
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2619,7 -2088,6 +2644,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:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2627,596 -2095,522 +2652,661 @@@ msgstr "
"\n"
"Algoritmes suportats:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Clau pública: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Xifratge: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Dispersió: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Compressió: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "forma d'ús: gpg [opcions] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, 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:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra en quin anell de claus està una clau llistada"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, 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:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "desactiva una clau"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "el destinatari predeterminat és desconegut «%s»\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "el destinatari predeterminat és desconegut «%s»\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "error en crear l'anell «%s»: %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: %s no és per a ús normal!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, 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:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, 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:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, 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:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, 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:3134
++#: g10/gpg.c:3502
#, 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:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
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:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no és permés amb %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "les preferències per defecte són invàlides\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "les preferències personals de xifrat són invàlides\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "les preferències personals de digest són invàlides\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "les preferències personals de compressió són invàlides\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, 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:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "l'algoritme de dispersió és invàlid «%s»\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [nom_del_fitxer]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [nom_del_fitxer]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [nom_del_fitxer]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom_del_fitxer]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [nom_del_fitxer]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [nom_del_fitxer]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [ordres]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, 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:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "error en la creació de la contrasenya: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[nom_del_fitxer]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
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:4704
++#: g10/gpg.c:5200
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:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "pren les claus d'aquest anell"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "fes els conflictes de marques de temps només un avís"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|escriu informació d'estat en aquest FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
# Werner FIXME: should it use «Usage»?
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3392,7 -2752,6 +3482,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "clau %08lX: sense ID\n"
@@@ -3402,7 -2760,6 +3492,7 @@@
msgid "key %s: %s\n"
msgstr "es descarta «%s»: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3425,7 -2778,6 +3515,7 @@@ msgstr "clau %08lX: l'ID no és vàlid\
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, 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"
@@@ -3435,131 -2786,119 +3525,146 @@@
msgid "key %s: new key - skipped\n"
msgstr "clau %08lX: clau nova - es descarta \n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "no s'ha trobat cap anell escrivible: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "s'està escrivint en «%s»\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, 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:1132
++#: g10/import.c:1136
#, 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:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, 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:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clau %08lX: «%s» 1 signatura nova\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clau %08lX: «%s» 1 subclau nova\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clau %08lX: «%s» %d subclaus noves\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clau %08lX: «%s» no ha estat modificada\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "clau %08lX: s'ha importat la clau secreta\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
@@@ -3569,22 -2908,18 +3674,22 @@@
# O «rebutjara»? ivb
# Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
# «es rebutja» està bé. jm
- #: g10/import.c:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, 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:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
@@@ -3592,116 -2927,95 +3697,116 @@@
"«%s»\n"
"\n"
- #: g10/import.c:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, 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:1997
++#: g10/import.c:2039
#, 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:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, 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:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clau %08lX: Subclau de revocació no vàlida\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, 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:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clau %08lX: es descarta l'ID d'usuari '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "clau %08lX: es descarta la subclau\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, 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:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
@@@ -3728,61 -3038,52 +3833,66 @@@ msgstr "s'ha creat l'anell «%s»\n
msgid "keyring '%s' created\n"
msgstr "s'ha creat l'anell «%s»\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "error en la lectura de «%s»: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[revocació]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[autosignatura]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 signatura errònia\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d signatures errònies\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signatura no comprovada per falta de clau\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signatures no comprovades per falta de clau\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 signatura no comprovada a causa d'un error\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signatures no comprovades a causa d'errors\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3794,65 -3095,55 +3904,70 @@@ msgstr "
"verificar les claus d'altres usuaris (mirant passaports,\n"
"comprovant empremtes de diferents fonts...)?\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Hi confie marginalment\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Hi confie plenament\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Segur que encara voleu signarla? (s/N) "
# O no s'ha pogut? ivb
# FIXME: comprovar context. jm
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " No es pot signar.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'ID d'usuari «%s» ha caducat."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'ID d'usuari «%s» no està autosignat."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'ID d'usuari «%s» no està autosignat."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Signar realment? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3861,11 -3152,9 +3976,11 @@@ msgstr "
"La vostra signatura en «%s»\n"
"és una signatura d'estil PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3874,11 -3163,9 +3989,11 @@@ msgstr "
"La vostra signatura actual en «%s»\n"
"ha caducat.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3887,43 -3174,34 +4002,43 @@@ msgstr "
"La vostra signatura en «%s»\n"
"és una signatura local.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "«%s» ja estava signada amb la clau %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "No hi ha res que signar amb la clau %08lX\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "La clau ha caducat!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Aquesta clau caducarà el %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3933,32 -3211,26 +4048,32 @@@ msgstr "
"pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
"contestar, entreu «0».\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No vaig a contestar.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) No ho he comprovat en absolut.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He fet algunes comprovacions.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) He fet comprovacions molt acurades.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3967,142 -3239,116 +4082,142 @@@ msgstr "
"Esteu segur que voleu signar aquesta clau\n"
"amb la vostra clau: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Açò serà una autosignatura.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"AVÍS: la signatura no es marcarà com a inexportable.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"AVÍS: la signatura no es marcarà com a irrevocable.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La signatura es marcarà com a inexportable.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La signatura es marcarà com a irrevocable.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"No he comprovat aquesta clau en absolut.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"He fet algunes comprovacions a aquesta clau.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"He comprovat aquesta clau amb molta cura.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Signar realment? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "s'està posant la signatura al lloc correcte\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "desa i ix"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra empremta"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Notació de signatura: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "llista claus i ID"
# Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb
# Yeah, els vaig corregir abans de que enviares la teua correcció. jm
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "tria l'ID d'usuari N"
# Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb
# Yeah, els vaig corregir abans de que enviares la teua correcció. jm
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "tria l'ID d'usuari N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "revoca signatures"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "signa la clau localment"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "afegeix un ID d'usuari"
@@@ -4110,139 -3356,110 +4225,139 @@@
# Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
# el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
# i no hem unificat en català. Potser li ho diré a Werner. jm.
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "afegeix un photo ID"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "esborra un ID d'usuari"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "esborra una clau secundària"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "afegeix una clau de revocació"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "No podeu canviar la data de caducitat de les claus v3\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marca l'ID d'usuari com a primari"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "llista les preferències (expert)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "llista les preferències (detallat)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "canvia la contrasenya"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "canvia la confiança"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revoca un ID d'usuari"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoca una clau secundària"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "activa una clau"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "desactiva una clau"
# Igual que dalt. ivb
# Idem :) jm
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostra el photo ID"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "La clau secreta està disponible.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Cal la clau secreta per a fer açò.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4250,272 -3467,215 +4365,272 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "La clau està revocada."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Realment voleu signar tots els ID d'usuari? "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Realment voleu signar tots els ID d'usuari? "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "la classe de signatura és desconeguda"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "No podeu esborrar l'últim ID d'usuari!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Realment voleu eliminar aquest ID d'usuari? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Heu de seleccionar, si més no, una clau.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Heu de seleccionar, si més no, una clau.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Realment voleu eliminar les claus seleccionades? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Realment voleu eliminar aquesta clau? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Realment voleu eliminar aquest ID d'usuari? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Realment voleu revocar aquesta clau? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Realment voleu revocar les claus seleccionades? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Realment voleu revocar aquesta clau? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estableix la llista de preferències"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Realment voleu actualitzar les preferències? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Voleu desar els canvis? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Voleu eixir sense desar? "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "La clau no ha canviat, per tant no cal actualització.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Usuari inexistent.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "No hi ha res que signar amb la clau %08lX\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Resum: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Funcionalitats: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Notació: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
# Potser %s haja d'anar darrere de «clau». ivb
# És cert. Nova funcionalitat de 1.2.0, IIRC. jm
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Aquesta clau pot ser revocada per la clau %s "
# Potser %s haja d'anar darrere de «clau». ivb
# És cert. Nova funcionalitat de 1.2.0, IIRC. jm
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Aquesta clau pot ser revocada per la clau %s "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (sensible)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "no s'ha pogut creat %s: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocada]"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr ""
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confiança: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Aquesta clau ha estat desactivada"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4523,19 -3683,14 +4638,19 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revocada]"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4544,18 -3699,15 +4659,18 @@@ msgstr "
" causar que una ID d'usuari diferent esdevinga en la primària "
"assumida.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "No podeu canviar la data de caducitat de les claus v3\n"
# Photo ID com abans. ivb
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4564,82 -3716,65 +4679,82 @@@ msgstr "
"AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
"algunes versions de PGP rebutgen aquesta clau.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
# Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)? ivb
# Hmm. Sí... (s/N/x) jm
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
# Werner FIXME: use ngettext. jm
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "S'ha esborrat %d signatura.\n"
# Werner FIXME: use ngettext. jm
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "S'han esborrat %d signatures.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "No s'hi ha eliminat res.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "invàlida"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4648,201 -3783,167 +4763,209 @@@ msgstr "
"AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
"fer que algunes versions de PGP rebutjen aquesta clau.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduïu l'ID d'usuari del revocador designat: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "No podeu canviar la data de caducitat de les claus v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Heu de seleccionar exactament un ID.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Notació de signatura: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Voleu sobreescriure? (s/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "No hi ha cap ID amb l'índex %d\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID d'usuari: «"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
"»\n"
"signat amb la vostra clau %08lX el %s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (no-exportable)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aquesta signatura va caducar el %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
# (s/N) ivb
# S! jm
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Heu signat els següents ID d'usuari:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (no-exportable)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocat per %08lX el %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Esteu a punt de revocar aquestes signatures:\n"
# (s/N)? ivb
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realment voleu crear els certificats de revocació? (s/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "ho hi ha clau secreta\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4885,14 -3978,10 +5008,14 @@@ msgstr "s'està escrivint l'autosignatu
msgid "writing key binding signature\n"
msgstr "s'està escrivint la signatura de comprovació de la clau\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@@ -5192,41 -4232,36 +5315,46 @@@ msgstr "
msgid "Real name: "
msgstr "Nom i cognoms: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "El nom no pot començar amb un dígit\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Adreça electrònica: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "No és una adreça vàlida\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Comentari: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Esteu usant el joc de caràcters `%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5237,7 -4272,6 +5365,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
@@@ -5254,35 -4288,28 +5382,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoXx"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Corregiu l'error primer\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5290,23 -4317,19 +5418,23 @@@ msgstr "
"Cal una contrasenya per a protegir la clau secreta.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5318,7 -4341,6 +5446,7 @@@ msgstr "
"useu aquest programa amb l'opció \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5330,12 -4352,10 +5458,12 @@@ msgstr "
"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
"d'aconseguir prou entropia.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5343,59 -4363,48 +5471,59 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "«%s» ja està comprimida\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Voleu crear la clau de tota manera? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Voleu crear la clau de tota manera? "
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "La generació de claus ha estat cancel·lada.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "s'està escrivint la clau pública a «%s»\n"
# Potser no hi haja cap anell! ivb
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "s'han creat i signat les claus pública i secreta.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5405,7 -4414,6 +5533,7 @@@ msgstr "
"\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
# Werner FIXME: Use ngettext. jm
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5414,7 -4422,6 +5542,7 @@@ msgstr "
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5422,248 -4429,196 +5550,248 @@@ msgstr "
"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realment? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr ""
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "mai "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Política de signatura crítica: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Política de signatura: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notació de signatura crítica: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notació de signatura: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 signatura errònia\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d signatures errònies\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Anell"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "es descarta «%s»: %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Empremtes digital de la clau primària:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Empremta digital de la clau primària:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " Empremta digital ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "s'està comprovant l'anell «%s»\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "s'han comprovat %lu claus (%lu signatures)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "s'han comprovat %lu claus (%lu signatures)\n"
# Fitxer indi fins final. Hau! ivb
# Grrr. Com em tracten els esclaus ja... jm
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: s'ha creat l'anell\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "la URL de política de signatura donada no és vàlida\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: no és un ID vàlid\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "s'està cercant «%s» al servidor HKP %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
@@@ -5697,7 -4646,6 +5825,7 @@@ msgstr "dades xifrades amb clau públic
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr ""
@@@ -5749,223 -4688,174 +5877,218 @@@ msgstr "desxifratge correcte\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom del fitxer original='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Signatura INCORRECTA de \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signatura caducada de \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "s'ha eliminat la verificació de signatura\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "no es poden tractar aquestes signatures múltiples\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
# «%.*s» no serà una data? Caldrà «el» al davant. ivb
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "La clau és disponible en: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[incert]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Aquesta signatura caduca el %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binari"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "mode text"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "desconeguda"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "l'algoritme de clau pública és desconegut"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "No s'ha pogut comprovar la signatura: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "no és una signatura separada\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signatura autònoma de classe 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "signatura de l'estil antic (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "l'algoritme de xifratge no és implementat"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5974,7 -4864,6 +6097,7 @@@ msgstr "AVÍS: %s és una opció desaco
# Gènere? Nombre? Passat, futur? ivb
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "No comprimit"
@@@ -5982,31 -4871,29 +6105,36 @@@
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "No comprimit"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "aquest missatge pot no ser usable per %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "la classe de signatura és desconeguda"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6214,31 -5068,24 +6342,31 @@@ msgstr "És aquesta foto correcta (s/N/
msgid "unable to display photo ID!\n"
msgstr "no s'ha pogut mostrar el photo ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "No s'ha especificat cap raó"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "La clau ha estat substituïda"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "La clau ha estat compromesa"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "La clau ja no s'usa"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "L'ID d'usuari ja no és vàlid"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "raó de la revocació: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "comentari de la revocació: "
@@@ -6252,101 -5099,82 +6380,101 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMxXoO"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"No hi ha cap valor de confiança assignat a:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr ""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = No ho sé\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NO confie\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Hi confie absolutament\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = torna al menú principal\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " o = omet aquesta clau\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " x = ix\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "La vostra decisió? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Realment voleu assignar confiança absoluta a aquesta clau? "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificats que duen a una clau de confiança absoluta:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Aquesta clau pertany probablement al seu propietari\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Aquesta clau és nostra\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6358,117 -5186,92 +6486,117 @@@ msgstr "
"«sí» a la següent pregunta\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Voleu usar de tota manera aquesta clau?"
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "AVÍS: S'està usant una clau no fiable!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
#, 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:546
++#: g10/pkclist.c:547
#, 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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Açò podria significar que la signatura és falsificada.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Aquesta clau ha estat desactivada.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Nota: La clau ha caducat!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVÍS: La clau NO és de confiança!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Probablement la signatura és FALSA.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: es descarta: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: es descarta: la clau pública està desactivada\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, 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:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6476,47 -5279,36 +6604,47 @@@ msgstr "
"\n"
"Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Usuari inexistent.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "La clau pública està desactivada.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "es descarta: la clau pública ja està establida\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "no hi ha adreces vàlides\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "les dades no s'han desat; useu l'opció \"--output\" per desar-les\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
@@@ -6524,29 -5316,23 +6652,29 @@@ msgstr "error en crear «%s»: %s\n
# Indi? ivb
# Em pense que no. jm
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Signatura separada.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Introduïu el nom del fitxer de dades: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "s'està llegint d'stdin...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "no hi ha dades signades\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "no s'han pogut obrir les dades signades `%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "no s'han pogut obrir les dades signades `%s'\n"
@@@ -6587,8 -5366,6 +6715,8 @@@ msgstr "NOTA: la clau secreta %08lX cad
msgid "Note: key has been revoked"
msgstr "NOTA: aquesta clau ha estat revocada!"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "ha fallat build_packet: %s\n"
@@@ -6598,43 -5374,39 +6726,49 @@@
msgid "key %s has no user IDs\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "A ser revocada per:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Aquesta és una clau de revocació sensible)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "La clau secreta està disponible.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "ha fallat make_keysig_packet: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "S'ha creat el certificat de revocació.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6642,19 -5414,27 +6776,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6673,34 -5453,27 +6820,34 @@@ msgstr "
"d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
"disponibles a altres!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Seleccioneu la raó de la revocació:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Cancel·la"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Segurament voleu seleccionar %d ací)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Raó de la revocació: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(No es va donar una descripció)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "És açò correcte? "
@@@ -6727,38 -5496,31 +6874,38 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostra més informació\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
# Werner FIXME: Use ngettext. jm
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6767,7 -5529,6 +6914,7 @@@ msgstr "
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6775,30 -5536,25 +6922,30 @@@ msgstr "
"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: aquesta clau ha estat revocada!"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
"desconegut\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
@@@ -6845,34 -5595,28 +6992,34 @@@ msgstr "
msgid "signing:"
msgstr "signatura:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "s'utilitzarà xifratge %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"la clau no està marcada com a insegura - no es pot utilitzar amb el GNA "
"fals!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "es descarta «%s»: duplicat\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
"a signatures!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@@ -6920,7 -5656,6 +7067,7 @@@ msgstr "error en trobar el registre de
msgid "read error in '%s': %s\n"
msgstr "error de lectura: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
@@@ -6952,7 -5682,6 +7099,7 @@@ msgid "trustdb transaction too large\n
msgstr "la transacció de la base de dades de confiança és massa gran\n"
# No em passe! ;) ivb
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
@@@ -7069,127 -5775,103 +7216,127 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "«%s» no és un ID de clau llarg vàlid\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "clau %08lX: s'accepta com a clau fiable\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr ""
"la clau %08lX apareix més d'una vegada en la base de dades de confiança\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr ""
"no és necessària una comprovació de la base de dades de confiança\n"
"\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr ""
"no és necessària una comprovació de la base de dades de confiança\n"
"\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr ""
"no és necessària una comprovació de la base de dades de confiança\n"
"\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "no s'ha trobat la clau pública %08lX: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "si us plau, feu un --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "s'està comprovant la base de dades de confiança\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "no s'han trobat claus amb confiança absoluta\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@@ -7427,11 -6060,9 +7574,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7573,12 -6176,10 +7720,12 @@@ msgstr "signatura %s, algorisme de resu
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
@@@ -7600,7 -6198,6 +7747,7 @@@ msgstr "Introduïu el nom d'usuari:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7660,12 -6245,10 +7807,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8120,7 -6611,6 +8267,7 @@@ msgstr "error en crear l'anell «%s»:
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "La generació de claus ha fallat: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8722,7 -7092,6 +8869,7 @@@ msgstr "Certificat invàlid
msgid " runtime cached certificates: %u\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "S'ha creat el certificat de revocació.\n"
@@@ -8732,8 -7100,6 +8879,8 @@@
msgid "certificate cached\n"
msgstr "Certificat de revocació vàlid"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
@@@ -8795,7 -7150,6 +8942,7 @@@ msgstr "no s'ha pogut eliminar el bloc
msgid "not removing file '%s'\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -9021,223 -7331,180 +9168,223 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "la resposta de l'agent és invàlida\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "converting S-expression failed: %s\n"
msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "creating S-expression failed: %s\n"
msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "ha fallat build_packet: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "%s: error en escriure el registre de directoris: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "Certificat correcte"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "s'ha eliminat la verificació de signatura\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "no es pot crear el directori «%s»: %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "no es pot crear el directori «%s»: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "lid ?: insert failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "lid ?: la inserció ha fallat: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "%s: error en escriure el registre de directoris: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: error en llegir el registre lliure: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
#| msgid "lid ?: insert failed: %s\n"
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "lid ?: la inserció ha fallat: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@@ -9283,77 -7540,61 +9430,77 @@@ msgstr "error en crear «%s»: %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "error en la lectura de «%s»: %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "S'ha creat el certificat de revocació.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
#| msgid "bad certificate"
msgid "validate a certificate"
msgstr "el certificat és incorrecte"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
#| msgid "bad certificate"
msgid "lookup a certificate"
msgstr "el certificat és incorrecte"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "Certificat invàlid"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "Certificat correcte"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Introduïu l'ID d'usuari del revocador designat: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9361,62 -7602,55 +9508,68 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "no s'ha pogut connectar amb «%s»: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "Certificat de revocació vàlid"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOTA: aquesta clau ha estat revocada!"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "no es pot fer stat de «%s»: %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
@@@ -9460,132 -7661,101 +9580,132 @@@ msgstr "s'ha produït un error mentre s
# 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
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmes suportats:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "Voleu eixir sense desar? "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, 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:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9598,77 -7768,61 +9718,77 @@@ msgstr "
"@\n"
"(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "forma d'ús: gpg [opcions] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "la línia és massa llarga\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "error de lectura: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
@@@ -9677,17 -7831,14 +9797,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:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "no forçat"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9939,12 -8039,10 +10059,12 @@@ msgstr "s'està cercant «%s» al servi
msgid "malloc failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9979,11 -8071,10 +10099,12 @@@ msgstr "error en la lectura de «%s»:
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -10131,72 -8192,61 +10252,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, 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:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10453,11 -8443,9 +10579,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/cs.gmo
index e188739,0000000..a3d50c6
mode 100644,000000..100644
Binary files differ
diff --cc po/cs.po
index 6cbce63,06f7662..5dc1d54
--- a/po/cs.po
+++ b/po/cs.po
@@@ -35,7 -35,6 +35,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg2 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2014-11-16 16:22+0100\n"
"Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
"Language-Team: Czech <translations.cs at gnupg.cz>\n"
@@@ -104,7 -93,6 +104,7 @@@ msgstr "nesprávné heslo
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Kvalita:"
@@@ -114,73 -102,57 +114,73 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Kvalita textu zde zadaného.\n"
"Na podrobnosti ohledně kritérií se zeptejte svého správce."
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
"Prosím, zadejte váš PIN, aby pro tuto relaci mohl být odemknut tajný klíč"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
"Prosím, zadejte vaše heslo, aby pro tuto relaci mohl být odemknut tajný klíč"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Heslo:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "neshodují se – zkuste to znovu"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (pokus %d z %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr "Znovu:"
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "PIN je příliš dlouhý"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Heslo je příliš dlouhé"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "Neplatný znak v PINu"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "PIN je příliš krátký"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "Špatný PIN"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Špatné heslo"
@@@ -189,24 -160,10 +189,24 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, c-format
msgid "can't create '%s': %s\n"
msgstr "nelze vytvořit „%s“: %s\n"
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "nelze otevřít „%s“: %s\n"
@@@ -281,11 -225,9 +281,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "Prosím, vložte kartu se sériovým číslem"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "Prosím, vyjměte kartu a vložte jinou se sériovým číslem"
@@@ -421,41 -337,27 +421,41 @@@ msgstr "
"@Volby:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "poběží v režimu démona (na pozadí)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "poběží v režimu serveru (na popředí)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "upovídaný režim"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "být o trochu víc tichý"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "vypisovat příkazy ve stylu sh"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "vypisovat příkazy ve stylu csh"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|SOUBOR|načíst volby ze SOUBORU"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "neodpojovat se od konzole"
@@@ -534,11 -419,6 +534,11 @@@ msgstr "zapnout podporu pro PuTTY
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -556,139 -434,101 +556,138 @@@ msgstr "
"Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
"Správa tajných klíčů pro @GNUPG@\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, 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:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, c-format
msgid "option file '%s': %s\n"
msgstr "soubor s možnostmi „%s“: %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "čtou se možnosti z „%s“\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "socket nelze vytvořit: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "název socketu „%s“ je příliš dlouhý\n"
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "chyba při získávání soli pro socket\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "chyba při přilepování socketu na „%s“: %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "volání listen() selhalo: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "naslouchá se na socketu „%s“\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "adresář „%s“ vytvořen\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "volání stat() na „%s“ selhalo: %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "„%s“ nelze použít jako domovský adresář\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba při čtení soli z deskriptoru %d: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "obsluha 0x%lx pro fd %d spuštěna\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "obsluha 0x%lx pro fd %d ukončena\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, 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:2288
++#: agent/gpg-agent.c:2273
#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s pozastaveno\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "v této relaci neběží žádný gpg-agent\n"
@@@ -704,8 -542,6 +703,8 @@@ msgstr "
"Syntaxe: gpg-preset-passphrase [volby] KEYGRIP\n"
"Správa dočasné paměti pro hesla\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -713,9 -549,6 +712,9 @@@ msgstr "
"@Příkazy:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -770,7 -595,6 +769,7 @@@ msgstr "zrušeno\n
msgid "error while asking for the passphrase: %s\n"
msgstr "chyba při ptaní se na heslo: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, c-format
msgid "error opening '%s': %s\n"
msgstr "chyba při otevírání „%s“: %s\n"
@@@ -953,8 -743,6 +952,8 @@@ msgstr "chyba při vytváření roury:
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba při vytváření proudu pro rouru: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "chyba při rozdvojování procesu: %s\n"
@@@ -1104,7 -860,6 +1103,7 @@@ msgstr "gpg-agent neběží – spouš
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "čeká se na agenta… (%d s)\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr "spojení na agenta ustanoveno\n"
@@@ -1124,7 -876,6 +1123,7 @@@ msgstr "žádný dirmngr neběží �
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "čeká se na dirmngr… (%d s)\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr "spojení na dirmngr ustanoveno\n"
@@@ -1383,7 -1074,6 +1382,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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "nedostatek paměti\n"
@@@ -1562,19 -1214,14 +1561,19 @@@ msgstr "předání dotazu %s klientovi
msgid "Enter passphrase: "
msgstr "Vložte heslo: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP karta není dostupná: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Nalezena OpenPGP karta číslo %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "nelze provést v dávkovém módu\n"
@@@ -1586,153 -1231,114 +1585,153 @@@ msgstr "Tento příkaz je dostupný pou
msgid "Reset Code not or not anymore available\n"
msgstr "Resetační kód není nebo už není dostupný\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Váš výběr? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[není nastaven]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "muž"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "žena"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "neuvedeno"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "není vyžadováno"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "vyžadováno"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Chyba: V současné verzi je povolenou pouze plain ASCII.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Chyba: Znak „<“ nelze použít.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Chyba: Více mezer není povoleno.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Příjmení držitele karty: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Jméno (křestní) držitele karty: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Chyba: jméno a příjmení je příliš dlouhé (limit je %d znaků).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "URL pro získání veřejného klíče: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Chyba: URL je příliš dlouhé (limit je %d znaků).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "chyba při alokování dostatečného množství paměti: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, c-format
msgid "error reading '%s': %s\n"
msgstr "chyba při čtení „%s“: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "chyba při zápisu do „%s“: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Login (jménu účtu): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Chyba: Login je příliš dlouhý (limit je %d znaků).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Privátní DO data: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Chyba: Privátní DO je příliš dlouhé (limit je %d znaků).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Jazykové předvolby: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Chyba: neplatná délka řetězce s předvolbami.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Chyba: neplatný znak v řetězci s předvolbami\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Zadejte pohlaví: M – mužské, F – ženské, nebo stiskněte mezerník: "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Chyba: neplatná odpověď.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "Otisk CA: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Chyba: chybně utvořené otisk.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "operace s klíčem není možná: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "toto není OpenPGP karta"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "chyba při získání informací o aktuálním klíči: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Přepsat existující klíč? (a/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1743,55 -1349,43 +1742,55 @@@ msgstr "
"dokumentace\n"
" své karty, kde se dozvíte, jaké velikosti jsou dovoleny.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Jakou délku klíče pro podepisování si přejete? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Jakou délku klíče pro šifrování si přejete? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Jakou délku klíče pro autentizaci si přejete? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrouhleno na %u bitů\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "velikost klíče %s musí být v intervalu %u-%u\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Karta bude nyní přenastavena na generování klíče dlouhého %u bitů\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "chyba při změně velikosti klíče %d na %u bitů: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Vytvořit zálohu šifrovacího klíče mimo kartu? (A/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
msgid "Note: keys are already stored on the card!\n"
msgstr "Poznámka: na kartě jsou již klíče uloženy!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Přepsat existující klíče? (a/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1802,144 -1396,109 +1801,144 @@@ msgstr "
" PIN = „%s“ PIN administrátora = „%s“\n"
"Měli byste je změnit příkazem --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Prosím, vyberte druh klíče, který chcete generovat:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Podepisovací klíč\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Šifrovací klíč\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Autentizační klíč\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Neplatný výběr.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Prosím vyberte místo pro uchování klíče:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Volání KEYTOCARD selhalo: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tento příkaz není v módů %s dovolený.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
#| msgid "Note: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Poznámka: na kartě jsou již klíče uloženy!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Continue? (Y/n) "
msgid "Continue? (y/N) "
msgstr "Pokračovat (A/n) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "ukončit toto menu"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "zobraz administrátorské příkazy"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "ukázat tuto pomoc"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "vypiš všechna dostupná data"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "změní jméno majitele karty"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "změní URL pro získání klíče"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "získá klíč specifikovaný v URL karty"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "změnit login name"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "změnit jazykové předvolby"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "změní pohlaví držitele karty"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "vypsat otisk certifikační autority"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "zapnout/vypnout požadování PINu při každé self-sign operaci"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "vytvořit nový pár klíčů"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "nabídka pro změnu anebo odblokování PINu"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "ověř PIN a vypiš všechna data"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "odblokovat PIN pomocí resetačního kódu"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/karta> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "pouze administrátorské příkazy\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "administrátorské příkazy jsou povoleny\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "administrátorské příkazy nejsou povoleny\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatný příkaz (zkuste „help“)\n"
@@@ -1947,76 -1505,63 +1946,83 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output pro tento příkaz není platný\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, c-format
msgid "can't open '%s'\n"
msgstr "„%s“ nelze otevřít\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klíč „%s“ nenalezen: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba při čtení bloku klíče: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "klíč „%s“ nenalezen: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(dokud neurčíte klíč jeho otiskem)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "bez parametru „--yes“ to nemohu v dávkovém módu provést\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Smazat tento klíč ze souboru klíčů? (a/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Toto je tajný klíč! - opravdu smazat? (a/N) "
# The first argument is a "key" or "subkey"
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "smazání tajného %s se nezdařilo: %s\n"
# deleting secret %s failed
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "klíče"
# deleting secret %s failed
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "subkey"
msgstr "podklíče"
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "smazání bloku klíče se nezdařilo: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "informace o důvěryhodnosti vlastníka klíče vymazány\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "tajný klíč pro veřejný klíč „%s“ existuje!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr ""
"abyste ho smazal(a), použijte nejprve parametr „--delete-secret-key“.\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba při vytváření hesla: %s\n"
@@@ -2066,7 -1603,6 +2072,7 @@@ msgstr "
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:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "použití %s není v módu %s dovoleno\n"
@@@ -2150,264 -1670,218 +2156,285 @@@ msgstr "VAROVÁNÍ: nelze smazat dočas
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "VAROVÁNÍ: nelze smazat dočasný adresář „%s“: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "exportovat podpisy, které jsou označeny jako jen místní (local-only)"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exportovat atributy uživatelských ID (obecně ID fotografií)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "exportovat revokační klíče označené jako „citlivé“"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "odstranit nepoužitelné části z klíče při exportu"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "odstranit při exportu z klíče vše, co lze"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "exportování tajného klíče není povoleno\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "klíč %s: PGP 2.x klíč – přeskočeno\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "klíč %s: tělo klíče je na kartě – přeskočeno\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
msgid " - skipped"
msgstr " – přeskočeno"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[ID uživatele nenalezeno]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "„%s“ automaticky získáno přes %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "chyba při získávání „%s“ přes %s: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "Chybí otisk"
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "tajný klíč „%s“ nenalezen: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "postrádám argument u volby „%.50s“\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NÁZEV|použít NÁZEV jako implicitní tajný klíč"
+
# c-format
- #: g10/getkey.c:1777
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Neplatný klíč %s změněn na platný pomocí --always-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "používám podklíč %s místo primárního klíče %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "vytvořit podpis"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "vytvořit podpis v čitelném dokumentu"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "vytvořit podpis oddělený od dokumentu"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "šifrovat data"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "šifrování pouze se symetrickou šifrou"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "dešifrovat data (implicitně)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "verifikovat podpis"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "vypsat seznam klíčů"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "vypsat seznam klíčů a podpisů"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "vypsat a zkontrolovat podpisy klíčů"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "vypsat seznam klíčů a otisků"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "vypsat seznam tajných klíčů"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "vytvořit nový pár klíčů"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
msgid "quickly generate a new key pair"
msgstr "rychle vytvořit nový pár klíčů"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly add a new user-id"
msgstr "rychle vytvořit nový pár klíčů"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr "komplexní vytvoření páru klíčů"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "vytvořit revokační certifikát"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "odstranit klíč ze souboru veřejných klíčů"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "odstranit klíč ze souboru tajných klíčů"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
msgid "quickly sign a key"
msgstr "rychle podepsat klíč"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
msgid "quickly sign a key locally"
msgstr "rychle lokálně podepsat klíč"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "podepsat klíč"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "podepsat klíč lokálně"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "podepsat nebo modifikovat klíč"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "změnit heslo"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "exportovat klíče"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "exportovat klíče na server klíčů"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importovat klíče ze serveru klíčů"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "vyhledat klíče na serveru klíčů"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "aktualizovat všechny klíče ze serveru klíčů"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importovat/sloučit klíče"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "vytisknout stav karty"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "změnit data na kartě"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "změnit PIN karty"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "aktualizovat databázi důvěry"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "vypsat hash zprávy"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "pracovat v režimu serveru"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "vytvoř výstup zakódovaný pomocí ASCII"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
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:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "použít kanonický textový mód"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|SOUBOR|zapsat výstup do SOUBORU"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "neprovádět žádné změny"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "vyžádat potvrzení před přepsáním"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "použít chování striktně podle OpenPGP"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2415,7 -1889,6 +2442,7 @@@ msgstr "
"@\n"
"(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2433,11 -1906,9 +2460,11 @@@ msgstr "
" --list-keys [jména] vypsat klíče\n"
" --fingerprint [jména] vypsat otisky\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2447,7 -1918,6 +2474,7 @@@ msgstr "
"Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
"Výchozí operace závisí na vstupních datech.\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2455,78 -1925,63 +2482,78 @@@ msgstr "
"\n"
"Podporované algoritmy:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Veřejný klíč: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Šifra: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Komprese: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "použití: %s [přepínače] %s\n"
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "konfliktní příkazy\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "no = podpis nalezen v definici skupiny „%s“\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2534,21 -1989,18 +2561,21 @@@ msgstr "
"VAROVÁNÍ: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
"nebezpečně\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2556,7 -2008,6 +2583,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:1531
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
@@@ -2564,474 -2015,426 +2591,546 @@@
"nastavena bezpečně\n"
# c-format
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "neznámá konfigurační položka „%s“\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "zobrazovat ID fotografií během výpisu klíčů"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
msgid "show key usage information during key listings"
msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "ukazovat URL politik během výpisu podpisů"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "ukazovat všechny poznámky během výpisu podpisů"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
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:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
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:1865
++#: g10/gpg.c:1881
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:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "ukazovat název souboru s klíči při výpisu klíčů"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "ukazovat data expirace během výpisu podpisů"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "Dostupné klíče:\n"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option '%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "neznámá volba „%s“\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command '%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "neznámý příkaz „%s“\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "volba „%.50s“ není jednoznačná\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring '%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
+
++#: g10/gpg.c:2423
#, 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:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Poznámka: %s není pro normální použití!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "„%s“ není platná doba expirace podpisu\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatný režim pinentry „%s“\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "„%s“ není platná znaková sada\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "nelze zpracovat URL serveru klíčů\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatný parametr pro import\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "neplatný parametr pro import\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parametr pro export\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "neplatný parametr pro export\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatný parametr pro výpis\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "zobrazovat ID fotografií při ověřování podpisu"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "ukazovat URL politik při ověřování podpisu"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "ukazovat všechny poznámky při ověřování podpisu"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
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:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
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:2931
++#: g10/gpg.c:3290
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:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "ověřovat podpisy s daty PKA"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatný parametr pro ověření\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "neplatný parametr pro ověření\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVÁNÍ: %s přepíše %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Není dovoleno používat %s s %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nedává s %s smysl!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nelze spustit s nebezpečnou pamětí vzhledem k %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "vybraný kompresní algoritmus je neplatný\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "položka completes-needed musí být větší než 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "položka marginals-needed musí být větší než 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "položka max-cert-depth musí být v rozmezí od 1 do 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"neplatná implicitní úroveň certifikace (default-cert-level); musí být 0, 1, "
"2 nebo 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
"neplatná minimální úroveň certifikace (min-cert-level); musí být 0, 1, 2 "
"nebo 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Poznámka: jednoduchý mód S2K (0) je důrazně nedoporučován\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "neplatné implicitní předvolby\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "neplatné uživatelské předvolby pro šifrování\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "neplatné uživatelské předvolby pro hashování\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "neplatné uživatelské předvolby pro komprimaci\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud není funkční s %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat databázi důvěry: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ #| msgid "line %d: invalid date given\n"
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "řádek %d: zadáno neplatné datum\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ #| msgid "line %d: invalid date given\n"
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "řádek %d: zadáno neplatné datum\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [jméno souboru]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [jméno souboru]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [jméno souboru]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [jméno souboru]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
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:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [jméno souboru]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
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:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [jméno souboru]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [jméno souboru]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [jméno souboru]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key id uživatele"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key id uživatele"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id uživatele [příkazy]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd <id-uživatele>"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odeslání na keyserver se nezdařilo: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dekódování z ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "kódování do ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatný hashovací algoritmus „%s“\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ #| msgid "error loading certificate '%s': %s\n"
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "chyba při zavádění certifikátu „%s“: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[jméno souboru]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Začněte psát svou zprávu ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "zadané URL pro certifikační politiku je neplatné\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "zadané URL pro podepisovací politiku je neplatné\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|SOUBOR|brát klíče z klíčenky (keyringu) SOUBOR"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "pouze varování při konfliktu časového razítka"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|zapsat informace o stavu do tohoto FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Použití: gpg [volby] [soubory] (-h pro pomoc)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3207,7 -2576,6 +3306,7 @@@ msgstr "
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:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "klíč %s: chybí identifikátor uživatele\n"
@@@ -3217,7 -2584,6 +3316,7 @@@
msgid "key %s: %s\n"
msgstr "klíč %s: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr "zamítnut kontrolou při importu"
@@@ -3241,7 -2603,6 +3340,7 @@@ msgstr "klíč %s: chybí platný ident
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
@@@ -3251,255 -2611,218 +3350,270 @@@
msgid "key %s: new key - skipped\n"
msgstr "klíč %s: nový klíč - přeskočen\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nenalezen zapisovatelný soubor klíčů (keyring): %s\n"
# g10/import.c:766 g10/openfile.c:261#, c-format
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "zapisuje se do „%s“\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klíč %s: veřejný klíč „%s“ importován\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klíč %s: neodpovídá naší kopii\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, 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:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klíč %s: „%s“ 1 nový podpis\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klíč %s: „%s“ %d nových podpisů\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klíč %s: „%s“ 1 nový podklíč\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klíč %s: „%s“ %d nových podklíčů\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klíč %s: „%s“ beze změn\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klíč %s: tajný klíč importován\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "klíč %s: tajný klíč již existuje\n"
- #: g10/import.c:1562
++#: g10/import.c:1575
#, 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:1663
++#: g10/import.c:1680
#, c-format
msgid "secret key %s: %s\n"
msgstr "tajný klíč %s: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "import tajných klíčů není povolen\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klíč %s: „%s“ revokační certifikát importován\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, 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:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klíč %s: neplatná vazba podklíče\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, 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:2062
++#: g10/import.c:2104
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "klíč %s: neexistuje podklíč pro revokaci klíče\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klíč %s: neplatný revokační podklíč\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, 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:2135
++#: g10/import.c:2177
#, 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:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klíč %s: podklíč přeskočen\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, 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:2549
++#: g10/import.c:2591
#, 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"
@@@ -3524,61 -2843,53 +3638,67 @@@ msgstr "schránka na klíče (keybox) �
msgid "keyring '%s' created\n"
msgstr "soubor klíčů (keyring) „%s“ vytvořen\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "zdroj bloku klíče „%s“: %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening '%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "chyba při otevírání „%s“: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "selhalo obnovení vyrovnávací paměti klíčů: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[revokace]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[podpis klíče jím samým]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 špatný podpis\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d špatných podpisů\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 podpis neověřen, protože chybí klíč\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d podpisů neověřených, protože chybí klíč\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 podpis neověřen, protože vznikla chyba\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d podpisů neověřených, protože vznikly chyby\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "objeven 1 identifikátor uživatele bez platného podpisu jím samým\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3590,17 -2901,14 +3710,17 @@@ msgstr "
"kontrolou otisků z různých zdrojů...)?\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Důvěřuji částečně\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Důvěřuji úplně\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3610,47 -2918,40 +3730,52 @@@ msgstr "
"Hloubka větší než 1 umožňuje klíčům, které jste podepsal\n"
"podepsat jiný klíč, který bude pro Vás důvěryhodný.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Prosím vložte doménu, pro kterou je podpis omezen nebo stiskněte enter pro "
"podpis bez omezení na doménu.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Uživatelské ID „%s“ je revokováno."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Jste si jistý(á), že stále chcete podepsat tento klíč? (a/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Nelze podepsat.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Vypršela platnost uživatelského ID „%s“."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID uživatele „%s“ není podepsáno jím samým."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID uživatele „%s“ je připraveno k podpisu."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Podepsat? (a/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3659,11 -2960,9 +3784,11 @@@ msgstr "
"Podpis klíče „%s“ jím samým je\n"
"podpis formátu PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Přejete si jej změnit na formát OpenPGP? (a/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3672,13 -2971,11 +3797,13 @@@ msgstr "
"Platnost vašeho podpisu na „%s“\n"
"vypršela.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Chcete vytvořit nový podpis a nahradit jím ten, jehož platnost vypršela? (a/"
"N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3687,43 -2984,34 +3812,43 @@@ msgstr "
"Váš současný podpis na „%s“\n"
"je pouze lokální.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Přejete si jej změnit na plně exportovatelný podpise? (a/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "„%s“ je již lokálně podepsán klíčem %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "„%s“ je již podepsán klíčem %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Chcete klíč přesto znova podepsat? (a/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nic k podepsání klíčem %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Platnost klíče vypršela!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnost klíče vyprší %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Chcete, aby platnost Vašeho podpisu vypršela ve stejnou dobu? (A/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3733,31 -3021,25 +3858,31 @@@ msgstr "
"patří výše uvedené osobě.\n"
"Pokud neznáte odpověď, zadejte „0“.\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpovím.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nijak jsem to nekontroloval(a).%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Částečně jsem to ověřil(a).%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Velmi pečlivě jsem to ověřil(a).%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
msgid "Your selection? (enter '?' for more information): "
msgstr "Váš výběr? (pro podrobnosti zadejte „?“): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3766,227 -3048,172 +3891,227 @@@ msgstr "
"Jste si jistý(á), že chcete podepsat tento klíč\n"
"svým klíčem „%s“ (%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Jedná se o podpis klíče jím samým.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "VAROVÁNÍ: podpis nebude označen jako neexportovatelný.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "VAROVÁNÍ: podpis nebude označen jako neodvolatelný (non-revocable).\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "Podpis bude označen jako neexportovatelný.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "Podpis bude označen jako neodvolatelný (non-revocable).\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Nijak jsem tento klíč neověřil.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "Částečně jsem ověřil tento klíč.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "Velmi pečlivě jsem ověřil tento klíč.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Skutečně podepsat? (a/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "podepsání selhalo: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"K dispozici je jen kontrolní součet klíče nebo je klíč na kartě - passphrase "
"nelze změnit.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "klíč %s: chyba při měnění hesla: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "přesunuji podpis klíče na správné místo\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "uložit a ukončit"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "vypsat otisk klíče"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Vložte keygrip: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "vypsat seznam klíčů a id uživatelů"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "vyberte identifikátor uživatele N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "vyberte podklíč N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "kontrolovat podpisy"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr "podepsat vybrané ID uživatele [* níže jsou uvedeny relevantní příkazy]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "podepsat vybrané uživatelské ID lokálně"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "podepsat vybrané uživatelské ID důvěryhodným podpisem"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "podepsat vybraná uživatelská ID neodvolatelným podpisem"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "přidat identifikátor uživatele"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "přidat fotografický ID"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "smazat vybrané ID uživatele"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "přidat podklíč"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "přidat klíč na kartu"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "přesunout klíč na kartu"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "přesunout záložní klíč na kartu"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "smazat vybrané podklíče"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "přidat revokační klíč"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "smazat podpisy z vybraných uživatelských ID"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "změnit datum expirace pro klíč nebo vybrané podklíče"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "označit vybrané uživatelské ID jako primární"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "vypsat seznam předvoleb (pro experty)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "vypsat seznam předvoleb (podrobně)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "nastavit sadu preferencí pro vybrané uživatelské ID"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "nastavit URL preferovaného serveru klíčů pro vybraná uživatelská ID"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "zadat poznámku pro vybraná uživatelská ID"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "změnit heslo"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "změnit důvěryhodnost vlastníka klíče"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "revokovat podpisu na vybraných uživatelských ID"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "revokovat vybrané uživatelské ID"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "revokovat klíč nebo vybrané podklíče"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "nastavit klíč jako platný (enable)"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "nastavit klíč jako neplatný (disable)"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "ukázat vybrané fotografické ID"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"směstnat nepoužitelná ID uživatelů a odstranit z klíče nepoužitelné podpisy"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "směstnat nepoužitelná ID uživatelů a odstranit z klíče všechny podpisy"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Tajný klíč je dostupný.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Pro provedení této operace je potřeba tajný klíč.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -3997,247 -3224,191 +4122,248 @@@ msgstr "
" s „t“ pro důvěryhodný podpis (tsign) nebo „nr“ pro neodvolatelný\n"
" podpis (nrsign) nebo libovolnou jejich kombinací (ltsign, tnrsign, atd.).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Klíč revokován."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Nápověda: Vyberte id uživatele k podepsání\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Neznámý typ podpisu „%s“\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tento příkaz není v módů %s dovolený.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Musíte vybrat alespoň jeden id uživatele.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Nemůžete smazat poslední id uživatele!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Opravdu odstranit všechny vybrané id uživatele? (a/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Opravdu odstranit tento id uživatele? (a/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Opravdu přesunout primární klíč? (a/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Musíte vybrat právě jeden klíč.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "Příkaz očekává jméno souboru jako argument\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Nelze otevřít „%s“: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Chyba při čtení záložního klíče z „%s“: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Musíte vybrat alespoň jeden klíč.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Opravdu chcete smazat vybrané klíče? (a/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Opravdu chcete smazat tento klíč? (a/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Opravdu revokovat všechny vybrané id uživatele? (a/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Opravdu revokovat tento id uživatele? (a/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Opravdu chcete revokovat celý klíč? (a/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Opravdu chcete revokovat vybrané podklíče? (a/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Opravdu chcete revokovat tento podklíč? (a/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Důvěryhodnost vlastníka nelze měnit je-li používána databáze důvěry "
"poskytnutá uživatelem\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Nastavit seznam předvoleb:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Opravdu aktualizovat předvolby pro vybraný id uživatele? (a/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Opravdu aktualizovat předvolby? (a/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Uložit změny? (a/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Ukončit bez uložení? (a/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "aktualizace selhala: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Klíč nebyl změněn, takže není potřeba jej aktualizovat.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "tajný klíč „%s“ nenalezen: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "„%s“ není otisk\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "„%s“ není primární otisk\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "No matching user IDs."
msgstr "Žádný identifikátor uživatele neodpovídá."
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "Nothing to sign.\n"
msgstr "Nic na podepsání.\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Hash: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Vlastnosti: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Keyserver bez modifikace"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Preferovaný keyserver: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Poznámky: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Uživatelský ID formátu PGP 2.x nemá žádné předvolby\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "V %s byl následující klíč revokován %s klíčem %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Tento klíč může být revokován %s klíčem %s "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(citlivá informace)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "vytvořen: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "revokován: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "platnost skončila: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "platnost skončí: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "použití: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "číslo karty: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "důvěra: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "platnost: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Tento klíč byl označen za neplatný (disabled)"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4246,17 -3417,12 +4372,17 @@@ msgstr "
"být nutně správné, dokud znova nespustíte program.\n"
# status
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "odvolán"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "platnost skončila"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4264,15 -3430,12 +4390,15 @@@ msgstr "
"VAROVÁNÍ: žádné uživatelské ID nebylo označeno jako primární. Tento příkaz\n"
" může způsobit, že za primární bude považováno jiné user ID.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "POZOR: Vašemu šifrovacímu podklíči brzy vyprší platnost.\n"
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
msgid "You may want to change its expiration date too.\n"
msgstr "Dobu platnosti také můžete změnit.\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4281,78 -3444,61 +4407,78 @@@ msgstr "
"VAROVÁNÍ: Toto je PGP2 klíč. Přidání fotografického ID může v některých\n"
" verzích PGP vést k odmítnutí tohoto klíče.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Jste si jistý, že jej chcete stále přidat? (a/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Neměli by jste přidávat fotografický ID k PGP2 klíči.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Smazat tento dobrý podpis? (a/N/u)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Smazat tento neplatný podpis? (a/N/u)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Smazat tento neznámý podpis? (a/N/u)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Smazán %d podpis.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Smazáno %d podpisů.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Nic nebylo smazáno.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "neplatný"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Uživatelské ID „%s“: %d podpisů odstraněno\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Uživatelské ID „%s“: %d podpisů odstraněno\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Uživatelské ID „%s“: je již minimalizované\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Uživatelské ID „%s“: je již odstraněné\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4361,184 -3507,153 +4487,195 @@@ msgstr "
"VAROVÁNÍ: Toto je PGP2 klíč. Přidání 'pověření revokace' může v některých\n"
" verzích PGP vést k odmítnutí tohoto klíče.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Neměli by jste přidávat 'pověření revokace' k PGP2 klíči.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Vložte identifikátor uživatele pověřeného revokací: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "klíč formátu PGP 2.x nelze pověřit revokací\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "klíč nelze pověřit revokací jím samým\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "tento klíč již byl pověřen revokací\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"VAROVÁNÍ: ustanovení klíče „pověřeným odvolatelem“ je nevratná operace!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Jste si jistí, že tento klíč chcete pověřit revokací? (a/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Prosím, vyberte nejvýše jeden podklíč.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "Jste si jistí, že tento klíč chcete pověřit revokací? (a/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Měním dobu expirace podklíče.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Měním dobu expirace primárního klíče.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nemůžete změnit dobu platnosti klíče verze 3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "podepisovací podklíč %s je již křížově certifikován\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "podklíč %s nepodepisuje, a tak není třeba jej křížově certifikovat\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Prosím, vyberte právě jeden id uživatele .\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "přeskočen v3 podpis klíče jím samým u uživatelského id „%s“\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Vložte URL preferovaného serveru klíčů: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Jste si jistý(á), že jej chcete přepsat? (a/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Vložte poznámku: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "Pokračovat (a/N)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Neexistuje uživatelské ID s hashem %s\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Neexistuje podklíč s indexem %d\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje podklíč s indexem %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID uživatele: „%s“\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "podepsáno vaším klíčem %s v %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (neexportovatelné)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnost podpisu vyprší %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Jste si jistý, že jej chcete stále revokovat? (a/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vytvořit pro tento podpis revokační certifikát? (a/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "Nepodepsáno vámi.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Podepsal(a) jste následující identifikátory uživatele: %s:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (neodvolatelné)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revokováno vaším klíčem %s v %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Chystáte se revokovat tyto podpisy:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opravdu vytvořit revokační certifikáty? (a/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "neexistuje tajný klíč\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "uživatelské ID „%s“ je již revokováno\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "VAROVÁNÍ: podpis ID uživatele je datován %d sekund v budoucnosti\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Klíč %s je již revokován.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Podklíč %s je již revokován.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíč %s (uid %d)\n"
@@@ -4577,14 -3684,10 +4714,14 @@@ msgstr "zapisuji podpis klíče sebou s
msgid "writing key binding signature\n"
msgstr "zapisuji „key-binding“ podpis\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatná délka klíče; použiji %u bitů\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "délka klíče zaokrouhlena na %u bitů\n"
@@@ -4875,40 -3929,35 +5012,45 @@@ msgstr "
msgid "Real name: "
msgstr "Jméno a příjmení: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Neplatný znak ve jméně\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Jméno nemůže začínat číslicí\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Jméno musí být dlouhé alespoň 5 znaků\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "E-mailová adresa: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Neplatná e-mailová adresa\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Komentář: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Neplatný znak v komentáři\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Používáte znakovou sadu „%s“.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4919,7 -3968,6 +5061,7 @@@ msgstr "
" „%s“\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do pole jméno nebo komentář nepište, prosím, e-mailovou adresu.\n"
@@@ -4934,33 -3982,26 +5076,33 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "jJkKeEPpUu"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Změnit (J)méno, (K)omentář, (E)-mail nebo (U)končit? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Změnit (J)méno, (K)omentář, (E)-mail, (P)okračovat dál nebo (U)končit "
"program? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Změnit (J)méno, (E)-mail nebo (U)končit? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Změnit (J)méno, (E)-mail, (P)okračovat dál nebo (U)končit? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Nejdřív, prosím, opravte chybu\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -4968,7 -4009,6 +5110,7 @@@ msgstr "
"Pro ochranu Vašeho tajného klíče musíte zadat heslo.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@@ -4976,16 -4016,13 +5118,16 @@@ msgstr "
"Prosím, zadejte heslo, kterým ochráníte zálohu mimo kartu nového šifrovacího "
"klíče."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "heslo není zopakováno správně; zkuste to znovu"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -4997,7 -4034,6 +5139,7 @@@ msgstr "
"tohoto programu s parametrem „--edit-key“.\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5010,12 -4046,10 +5152,12 @@@ msgstr "
"používat disky); díky tomu má generátor lepší šanci získat dostatek "
"entropie.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvoření klíče se nepodařilo: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5026,52 -4060,41 +5168,52 @@@ msgstr "
" „%s“\n"
"\n"
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr "Pokračovat (A/n) "
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Klíč pro „%s“ již existuje\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
msgid "Create anyway? (y/N) "
msgstr "Přesto vytvořit? (a/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
msgid "creating anyway\n"
msgstr "přesto se vytváří\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "Poznámka: Pro komplexní tvorbu klíče použijte „%s %s“.\n"
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Vytváření klíče bylo zrušeno.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, c-format
msgid "writing public key to '%s'\n"
msgstr "veřejný klíč se zapisuje do „%s“\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenalezen zapisovatelný soubor veřejných klíčů (pubring): %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "chyba při zápisu do souboru veřejných klíčů „%s“: %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "veřejný a tajný klíč byly vytvořeny a podepsány.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5079,7 -4102,6 +5221,7 @@@ msgstr "
"Tento klíč nemůže být použitý pro šifrování. K vytvoření\n"
"sekundárního klíče pro tento účel můžete použít příkaz „--edit-key“.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5087,7 -4109,6 +5229,7 @@@ msgstr "
"klíč byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5095,238 -4116,186 +5237,238 @@@ msgstr "
"klíč byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "Poznámka: vytvoření podklíčů pro klíče v3 není v souladu s OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajné části primárního klíče nejsou dostupné.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajná část primárního klíče jsou uloženy na kartě.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Opravdu vytvořit? (a/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "uložení klíče na kartu se nezdařilo: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "záložní soubor „%s“ nelze vytvořit: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Poznámka: záloha klíče z karty uložena do „%s“\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "nikdy "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritická podepisovací politika: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Podepisovací politika: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Kriticky preferovaný keyserver: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritická podepisovací notace: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Podepisovací notace: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 špatný podpis\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d špatných podpisů\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr "Pozor: %lu klíč(ů) přeskočen(o) kvůli jejich přílišné velikosti\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Soubor klíčů (keyring)"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "přeskočen „%s“: %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Otisk primárního klíče:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Otisk podklíče:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Otisk primárního klíče:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Otisk podklíče:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Otisk klíče ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " Sériové číslo karty ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, c-format
msgid "caching keyring '%s'\n"
msgstr "zapamatovává se soubor klíčů „%s“\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu klíčů již uloženo v keši (%lu podpisů)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu klíčů uloženo v keši (%lu podpisů)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: soubor klíčů (keyring) vytvořen\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "zahrnout do výsledku hledání odvolané klíče"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "zahrnout podklíče, když se hledá podle ID klíče"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "automaticky získávat klíče při ověřování podpisů"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "respektovat URL upřednostňovaných serverů klíčů daného klíče"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "respektovat PKA záznamy klíče při získávání klíčů"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "zneplatněn"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Vložte číslo (čísla), „N“ pro další, nebo „Q“ pro konec > "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatný protokol serveru klíčů (naše %d!=obsluha %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "„%s“ není ID klíče: přeskočeno\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "aktualizuji 1 klíč z %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROVÁNÍ: nelze aktualizovat klíč %s prostřednictvím %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "aktualizuji %d klíčů z %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "klíč „%s“ nebyl na serveru klíčů nalezen\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "klíč nebyl na serveru klíčů nalezen\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "žádný server klíčů není znám (použijte volbu --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "požaduji klíč %s ze %s server %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "požaduji klíč %s z %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "posílám klíč %s na %s server %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "posílám klíč %s na %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, c-format
msgid "requesting key from '%s'\n"
msgstr "požaduje se klíč z „%s“\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROVÁNÍ: URI %s nelze získat: %s\n"
@@@ -5360,7 -4323,6 +5502,7 @@@ msgstr "data zašifrována veřejným k
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "zašifrována %u-bitovým %s klíčem, ID %s, vytvořeným %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " „%s“\n"
@@@ -5410,252 -4363,201 +5552,253 @@@ msgstr "dešifrování o.k.\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROVÁNÍ: se zašifrovanou zprávou bylo manipulováno!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "vymazané heslo zapamatované pro ID: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "dešifrování selhalo: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Poznámka: odesílatel považoval data za důvěrná („for-your-eyes-only“)\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "původní jméno souboru='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "VAROVÁNÍ: zachyceno více prostých textů\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"samostatný revokační certifikát – použijte „gpg --import“, chcete-li jej "
"užít\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "nenalezen žádná podpis\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ŠPATNÝ podpis od „%s“"
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypršenou platností od „%s“"
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "Dobrý podpis od „%s“"
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "verifikace podpisu potlačena\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "neumím pracovat s těmito nejednoznačnými daty\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Podpis vytvořen %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, 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:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Klíč k dispozici na: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[nejistý]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " alias „%s“"
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnost podpisu skončila %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnost podpisu skončí %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binární formát"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "textový formát"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "neznámý formát"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
msgid ", key algorithm "
msgstr ", algoritmus klíče"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nemohu ověřit podpis: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "toto není podpis oddělený od dokumentu\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatný podpis třídy 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starého typu (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "volání fstat nad „%s“ selhalo v %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) selhal v %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "VAROVÁNÍ: používám experimentální algoritmus veřejného klíče %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "VAROVÁNÍ: Podepisovací a šifrovací klíče Elgamal se nedoporučují\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "VAROVÁNÍ: používám experimentální šifrovací algoritmus %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "VAROVÁNÍ: používám experimentální hashovací algoritmus %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "VAROVÁNÍ: vyžádaný algoritmus %s není doporučen\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Poznámka: podpisy používající algoritmus %s jsou zamítány\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: použití parametru „%s“ se nedoporučuje\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROVÁNÍ: používání parametru „%s“ se nedoporučuje\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "použijte místo něj „%s%s“ \n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "VAROVÁNÍ: používání příkaz „%s“ se nedoporučuje - nepoužívejte jej\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: „%s“ je v tomto souboru zastaralý – účinkuje pouze v %s\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje kromě v %s\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Nezkomprimováno"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "nezkomprimováno|nic"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "tato zpráva nemusí být s %s použitelná\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "nejednoznačná volba „%s“\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, c-format
msgid "unknown option '%s'\n"
msgstr "neznámá volba „%s“\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"U veřejného klíče ECDSA se očekává, že v kódování SEC bude délka násobkem 8 "
"bitů\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type '%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Neznámý typ podpisu „%s“\n"
+
+#: g10/openfile.c:85
#, c-format
msgid "File '%s' exists. "
msgstr "Soubor „%s“ existuje. "
@@@ -5842,31 -4711,24 +5985,31 @@@ msgstr "Je tato fotografie správná (a
msgid "unable to display photo ID!\n"
msgstr "nelze zobrazit photo ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Důvod nebyl specifikován"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Klíč je nahrazen"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Klíč byl zkompromitován"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Klíč se již nepoužívá"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Identifikátor uživatele již neplatí"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "důvod pro revokaci: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "revokační poznámka: "
@@@ -5880,52 -4742,41 +6023,52 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMuUsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Není přiřazena žádná hodnota důvěry:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " alias „%s“\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "Nakolik důvěřujete tvrzení, že tento klíč patří uvedenému uživateli?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Nevím nebo neřeknu\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Nedůvěřuji\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Důvěřuji absolutně\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = zpět do hlavního menu\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = přeskočit tento klíč\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " u = ukončit\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -5934,37 -4785,29 +6077,37 @@@ msgstr "
"Minimální úroveň důvěry tohoto klíče je: %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Vaše rozhodnutí? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Opravdu chcete nastavit pro tento klíč absolutní důvěru? (a/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certifikáty vedoucí k finálnímu důvěryhodnému klíči:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr "%s: Nic nenaznačuje tomu, že tento klíč patří uvedenému uživateli\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr "%s: Je zde částečná důvěra, že tento klíč patří uvedenému uživateli\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Tento klíč pravděpodobně náleží uvedenému uživateli\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Tento klíč náleží nám (máme odpovídající tajný klíč)\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -5975,113 -4818,88 +6118,113 @@@ msgstr "
"následující otázku odpovědět ano\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "Použít přesto tento klíč? (a/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "VAROVÁNÍ: Je použit nedůvěryhodný klíč!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " To může znamenat, že podpis je padělaný.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Poznámka: Tento klíč byl označen jako neplatný (disabled).\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Poznámka: Podepisovatelova ověřená adresa je „%s“\n"
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, 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:600
++#: g10/pkclist.c:601
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:608
++#: g10/pkclist.c:609
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:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Poznámka: Skončila platnost tohoto klíče!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROVÁNÍ: NEDŮVĚŘUJEME tomuto klíči!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Tento podpis je pravděpodobně PADĚLANÝ.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: přeskočeno: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, 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:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, 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:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Aktuální příjemci:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6089,74 -4907,57 +6232,74 @@@ msgstr "
"\n"
"Napište identifikátor uživatele (user ID). Ukončete prázdným řádkem: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Takový identifikátor uživatele neexistuje.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Veřejný klíč je neplatný (disabled).\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "přeskočeno: veřejný klíč je již nastaven\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "neznámý implicitní adresát „%s“\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "žádné platné adresy\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Poznámka: klíči %s chybí vlastnost %s\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Poznámka: klíči %s chybí předvolby pro %s\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"data nebyla uložena; k jejich uložení použijte parametr příkazu „--output“\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, c-format
msgid "error creating '%s': %s\n"
msgstr "chyba při vytváření „%s“: %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Podpis oddělený od dokumentu.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Prosím, vložte název datového souboru: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "čtu standardní vstup…\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "chybí podepsaná data\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "nelze otevřít podepsaná data „%s“\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nelze otevřít podepsaná data na deskriptoru=%d: %s\n"
@@@ -6193,8 -4987,6 +6336,8 @@@ msgstr "Poznámka: platnost tajného kl
msgid "Note: key has been revoked"
msgstr "Poznámka: klíč byl odvolán"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "selhalo vytvoření paketu (build_packet): %s\n"
@@@ -6204,41 -4995,37 +6347,47 @@@
msgid "key %s has no user IDs\n"
msgstr "klíč %s: chybí identifikátor uživatele\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Revokován:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Toto je citlivý revokační klíč)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Tajný klíč je dostupný.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Vytvořit pro tento klíč pověřený revokační certifikát? (a/N)"
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "nařízen výstup do formátu ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "vytvoření podepisovacího paketu (make_keysig_packet) selhalo: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Revokační certifikát vytvořen.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "pro „%s“ nebyl nalezen žádný revokační klíč\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Toto je revokační certifikát pro OpenPGP klíč:"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6249,7 -5036,6 +6398,7 @@@ msgstr "
"soukromého klíče. Avšak bude-li soukromý klíč stále přístupný, bude\n"
"lepší vytvořit nový revokační certifikát s vysvětlením odvolání."
- #: g10/revoke.c:564
++#: g10/revoke.c:572
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"
@@@ -6259,11 -5045,21 +6408,25 @@@ msgstr "
"vložena dvojtečka. Před použitím tohoto revokačního certifikátu odstraňte\n"
"tuto dvojtečku textovým editorem."
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "tajný klíč „%s“ nenalezen: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Vytvořit pro tento klíč revokační certifikát? (a/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6282,33 -5078,26 +6445,33 @@@ msgstr "
"na vašem počítači může ukládat data určená k tisku a zpřístupnit je\n"
"jiným uživatelům!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Prosím vyberte důvod revokace:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Zrušit"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Pravděpodobně zda chcete vybrat %d)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Můžete vložit další popis. Ukončete prázdným řádkem:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Důvod revokace: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Nebyl zadán Žádný popis)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Je důvod revokace vybrán správně? (a/N) "
@@@ -6333,36 -5118,29 +6496,36 @@@ msgstr "%s klíč %s používá nebezpe
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "%s klíč %s vyžaduje hash o délce %zu nebo více bitů (hash je %s)\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROVÁNÍ: konflikt hashe podpisu ve zprávě\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "VAROVÁNÍ: podepisovací podklíč %s není křížově certifikován\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "více informací naleznete na adrese %s\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "VAROVÁNÍ: podepisovací podklíč %s má neplatnou křížovou certifikaci\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "veřejný klíč %s je o %lu sekund novější než podpis\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "veřejný klíč %s je o %lu sekund novější než podpis\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6370,7 -5148,6 +6533,7 @@@ msgstr "
"klíč %s byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6378,29 -5155,24 +6541,29 @@@ msgstr "
"klíč %s byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Poznámka: podpisovému klíči %s skončila platnost v %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Poznámka: podpisový klíč %s byl odvolán\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"předpokládám špatný podpis klíčem %s, protože je nastaven neznámý kritický "
"bit\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "klíč %s: neexistuje podklíč pro revokaci podklíče\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "klíč %s: podklíč který je svázán s podpisem neexistuje\n"
@@@ -6446,33 -5212,27 +6609,33 @@@ msgstr "
msgid "signing:"
msgstr "podepisuji:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude použito šifrování %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"klíč není označen jako nedostatečně bezpečný – nemohu jej použít s falešným "
"RNG!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "přeskočen „%s“: duplikován\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "přeskočeno: tajný klíč je už v databázi\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"toto je PGP klíč vygenerovaný podle algoritmu Elgamal,\n"
"podpisy vytvořené tímto klíčem nejsou bezpečné!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "záznam důvěry %lu, typ %d: zápis selhal: %s\n"
@@@ -6517,7 -5269,6 +6680,7 @@@ msgstr "chyba při hledání záznamu d
msgid "read error in '%s': %s\n"
msgstr "chyba při čtení v „%s“: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "databáze důvěry: synchronizace selhala %s\n"
@@@ -6546,7 -5292,6 +6709,7 @@@ msgstr "záznam v databázi důvěry %l
msgid "trustdb transaction too large\n"
msgstr "transakce s databází důvěry je příliš dlouhá\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "k „%s“ nelze přistoupit: %s\n"
@@@ -6660,112 -5382,89 +6823,112 @@@ msgstr "nemohu pracovat s řádky delš
msgid "input line longer than %d characters\n"
msgstr "vstupní řádek je delší než %d znaků\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "„%s“ není platný dlouhý keyID\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "klíč %s: akceptován jako důvěryhodný klíč\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "klíč %s se v databázi důvěry vyskytuje více než jednou\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "klíč %s: nenalezen veřejný klíč k důvěryhodnému klíči – přeskočeno\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "klíč %s označen jako absolutně důvěryhodný.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "záznam důvěry %lu, typ pož. %d: čtení selhalo: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "záznam důvěry %lu není požadovaného typu %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "Databázi důvěry můžete zkusit znovu vytvořit pomocí těchto příkazů:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "Pokud to nebude fungovat, prosím, nahlédněte do návodu\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"nelze použít neznámý model důvěry (%d) – předpokládáme použití modelu %s\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "použití modelu důvěry %s\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "není nutné kontrolovat databázi důvěry\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "další kontrola databáze důvěry v %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "není nutné kontrolovat databázi důvěry s modelem „%s“\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "není nutné aktualizovat databázi důvěry s modelem „%s“\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "veřejný klíč %s nebyl nalezen: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "prosím proveďte --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "kontroluji databázi důvěry\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "zpracováno %d klíčů (%d validit vymazáno)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "žádný absolutně důvěryhodný klíč nebyl nalezen\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "veřejný klíč k absolutně důvěryhodnému klíči %s nebyl nalezen\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "požadováno %d částečné důvěry a %d úplné důvěry, model %s\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -6773,7 -5472,6 +6936,7 @@@ msgstr "
"hloubka: %d platných: %3d podepsaných: %3d důvěra: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "nelze aktualizovat záznam v databázi důvěry: chyba při zápisu: %s\n"
@@@ -7015,11 -5664,9 +7178,11 @@@ msgstr "PIN pro CHV%d je příliš krá
msgid "verify CHV%d failed: %s\n"
msgstr "ověření CHV%d se nezdařilo: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "chyba při získání CHV z karty\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "karta je trvale uzamčena!\n"
@@@ -7151,12 -5770,10 +7314,12 @@@ msgstr "karta nepodporuje hashovací al
msgid "signatures created so far: %lu\n"
msgstr "dosud vytvořené podpisy: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "ověření PIN správce je nyní prostřednictvím tohoto příkazu zakázáno\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@@ -7176,7 -5790,6 +7339,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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
@@@ -7233,12 -5834,10 +7396,12 @@@ msgid "please use the option '--daemon
msgstr ""
"prosím, použijte volbu „--daemon“, chcete-li nechat běžet program na pozadí\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "obsluha pro deskriptor %d spuštěna\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obsluha pro deskriptor %d ukončena\n"
@@@ -7656,7 -6163,6 +7819,7 @@@ msgstr "řádek %d: chyba při získáv
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "řádek %d: generování klíče se nepodařilo: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8239,7 -6625,6 +8402,7 @@@ msgstr " trvale zavedených certifik�
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:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
msgid "certificate already cached\n"
msgstr "certifikát již v keši\n"
@@@ -8247,8 -6631,6 +8410,8 @@@
msgid "certificate cached\n"
msgstr "certifikát uložen do keše\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, c-format
msgid "error caching certificate: %s\n"
msgstr "chyba při ukládání certifikátu do keše: %s\n"
@@@ -8307,7 -6678,6 +8470,7 @@@ msgstr "odstraňuje se soubor keše „
msgid "not removing file '%s'\n"
msgstr "soubor „%s“ nebude neodstraněn\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, c-format
msgid "error closing cache file: %s\n"
msgstr "chyba při zavírání souboru keše: %s\n"
@@@ -8537,151 -6863,121 +8700,151 @@@ 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:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "neznámý hašovací algoritmus „%s“\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr "gcry_md_open selhalo na algoritmu %d: %s\n"
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr "z libksba obdržen neplatný S-výraz\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, c-format
msgid "converting S-expression failed: %s\n"
msgstr "převod S-výrazu se nezdařil: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "výroba S-výrazu selhala: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, c-format
msgid "ksba_crl_parse failed: %s\n"
msgstr "ksba_crl_parse selhal: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "chyba při zjišťování časů aktualizace CRL %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr "časy aktualizace tohoto CRL: tento=%s příští=%s\n"
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr "nextUpdate neuvedeno, předpokládaná perioda platnosti bude jeden den\n"
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, c-format
msgid "error getting CRL item: %s\n"
msgstr "chyba při získávání položky CRL: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "chyba vkládání položky do dočasného souboru keše: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "v CRL nebyl nalezen žádný vydavatel CRL: %s\n"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr "certifikát vydavatele CRL bude hledán podle authorityKeyIdentifier\n"
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, c-format
msgid "CRL signature verification failed: %s\n"
msgstr "ověřování podpisu CRL selhalo: %s\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "chyba při kontrole platnosti certifikátu vydavatele CRL: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "volání ksba_crl_new selhalo: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "volání ksba_crl_set_reader selhalo: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "odstraněn zastaralý dočasný soubor keše „%s“\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "problém s odstraňováním zastaralého dočasného souboru keše „%s“: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "chyba při vytváření dočasného souboru keše „%s“: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, c-format
msgid "crl_parse_insert failed: %s\n"
msgstr "volání crl_parse_insert selhalo: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "chyba při dokončování dočasného souboru keše „%s“: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "chyba při uzavírání dočasného souboru keše „%s“: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
"POZOR: nový CRL je stále příliš starý; jeho platnost vypršela %s – stejně "
"bude nahrán\n"
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr "nový CRL je stále příliš starý; jeho platnost vypršela %s\n"
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr "neznámé kritické rozšíření CRL %s\n"
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "chyba při čtení rozšíření CRL: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, c-format
msgid "creating cache file '%s'\n"
msgstr "vytváří se soubor keše „%s“\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "problém s přejmenováním „%s“ na „%s“: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
@@@ -8689,65 -6985,52 +8852,65 @@@ msgstr "
"aktualizace souboru DIR selhalo – záznam keše bude při příštím startu "
"programu ztracen\n"
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr "Zahajuje se výpis CRL (získán přes %s)\n"
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
" CHYBA: CRL nebude použit, protože i po aktualizaci byl příliš starý!\n"
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr " CHYBA: CRL nebude použit kvůli neznámému kritickému rozšíření!\n"
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr " CHYBA: CRL nebude použit\n"
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr " CHYBA: Tento nakešovaný CRL byl možná pozměněn!\n"
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
msgid " WARNING: invalid cache record length\n"
msgstr " POZOR: neplatná délka záznamu keše\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, c-format
msgid "problem reading cache record: %s\n"
msgstr "problém se čtením záznamu keše: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, c-format
msgid "problem reading cache key: %s\n"
msgstr "problém se čtením klíče keše: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "chyba při čtení položky keše z databáze: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr "Konec výpisu CRL\n"
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "volání crl_fetch přes DP selhalo: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "volání crl_cache_insert přes DP selhalo: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "volání crl_cache_insert přes vydavatele selhalo: %s\n"
@@@ -8793,67 -7066,51 +8956,67 @@@ msgid "error retrieving '%s': http stat
msgstr "chyba při získávání „%s“: status HTTP je %u\n"
# Poslední argument je název protokolu
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
#| msgid "CRL access not possible due to disabled %s\n"
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "Přístup k CRL není možný kvůli vypnutému %s\n"
+#: dirmngr/crlfetch.c:386
#, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "dohledání certifikátu nemožné kvůli vypnutému %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr "místo CRL použije OCSP"
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr "zjistí, jestli dirmngr běží"
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
msgid "add a certificate to the cache"
msgstr "přidá certifikát do keše"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
msgid "validate a certificate"
msgstr "ověří platnost certifikátu"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
msgid "lookup a certificate"
msgstr "vyhledá certifikát"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
msgid "lookup only locally stored certificates"
msgstr "hledá pouze mezi lokálně uloženými certifikáty"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr "u --lookup očekává URL"
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr "zavede CRL do dirmngr"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr "zvláštní režim pro použití se Squidem"
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
msgid "expect certificates in PEM format"
msgstr "očekává certifikáty ve formátu PEM"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
msgstr "vynutí použití výchozího OCSP odpovídače"
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Použití: dirmngr-client [volby] [cert_soubor|vzor] (-h pro nápovědu)\n"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -8865,214 -7122,143 +9028,187 @@@ msgstr "
"Proces vrátí 0, pokud je certifikát platný, 1, pokud není platný nebo jiný\n"
"chybový kód značící obecné selhání.\n"
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "chyba při čtení certifikátu ze standardního vstupu: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "chyba při čtení certifikátu z „%s“: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr "certifikát je příliš velký, než aby dával smysl\n"
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, c-format
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "k dirmngr se nelze připojit: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, c-format
msgid "lookup failed: %s\n"
msgstr "hledání selhalo: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "zavádění CRL „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr "démon dirmngr běží\n"
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "ověření platnosti certifikátu selhalo: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
msgid "certificate is valid\n"
msgstr "certifikát je platný\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
msgid "certificate has been revoked\n"
msgstr "certifikát byl odvolán\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, c-format
msgid "certificate check failed: %s\n"
msgstr "kontrola certifikátu selhala: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr "obdržen status: „%s“\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "chyba při zápisu kódování base64: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "alokace kontextu assuan selhala: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr "dirmngr zjevně neběží\n"
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr "žádný dirmngr neběží – jeden bude spuštěn\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr "špatně utvořená proměnná prostředí %s\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "verze %d protokolu dirmngr není podporována\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "k dirmngr se nelze připojit – zkusí se náhradní postup\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "k dirmngr se nelze připojit: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "nepodporovaný dotaz „%s“\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr "očekáván absolutní název souboru\n"
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr "hledá se „%s“\n"
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr "poběží jako služba Windows (na pozadí)"
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr "vypíše obsah CRL keše"
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
msgid "|FILE|load CRL from FILE into cache"
msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|stáhne CRL z URL"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr "vypne dirmngr"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr "vyprázdní keš"
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
msgid "run without asking a user"
msgstr "běží bez dotazování se uživatele"
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr "vynutí zavedení zastaralých CRL"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr "povolí odesílání OCSP dotazů"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr "zakáže použití HTTP"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr "zakáže použití LDAP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr "ignoruje HTTP distribuční místa CRL "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr "ignoruje LDAP distribuční místa CRL"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr "|STROJ|pro LDAP dotazy použije STROJ"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "nepoužije náhradní stroje s --ldap-proxy"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|FILE|read LDAP server list from FILE"
msgstr "|SOUBOR|načte seznam LDAP serverů ze SOUBORU"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 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:207
++#: dirmngr/dirmngr.c:209
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|použije OCSP odpovídače na URL"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
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:219
++#: dirmngr/dirmngr.c:222
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:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9081,11 -7267,9 +9217,11 @@@ msgstr "
"@\n"
"(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9093,78 -7277,61 +9229,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:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "platné úrovně ladění jsou: %s\n"
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, c-format
msgid "usage: %s [options] "
msgstr "použití: %s [volby] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
msgid "colons are not allowed in the socket name\n"
msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "stahování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "zpracování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, 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:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: zjištěn neplatný otisk\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: chyba čtení: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, 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:1794
++#: dirmngr/dirmngr.c:1804
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:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr "přijat SIGTERM – vypíná se…\n"
# TODO: plural
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
msgid "shutdown forced\n"
msgstr "vypnutí vynuceno\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr "přijat SIGINT – okamžité vypnutí\n"
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "přijat signál č. %d – žádná akce nedefinována\n"
@@@ -9405,12 -7521,10 +9541,12 @@@ msgstr "na seznam LDAP serverů se při
msgid "malloc failed: %s\n"
msgstr "funkce malloc selhala: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: chybný vzor „%s“\n"
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search přesáhl omezení velikosti serveru\n"
@@@ -9442,13 -7550,11 +9578,13 @@@ msgstr "chyba při čtení z odpovída
msgid "response from server too large; limit is %d bytes\n"
msgstr "odpověď serveru je příliš velká, limit je %d bajtů\n"
+#: dirmngr/ocsp.c:139
#, fuzzy
#| msgid "OCSP request not possible due to disabled HTTP\n"
- msgid "OCSP request not possible due to TOR mode\n"
+ msgid "OCSP request not possible due to Tor mode\n"
msgstr "OCSP dotaz není možný, protože HTTP je zakázáno\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr "OCSP dotaz není možný, protože HTTP je zakázáno\n"
@@@ -9592,71 -7668,60 +9728,76 @@@ msgstr "OCSP odpovídač vrátil ne sou
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP odpovídač vrátil příliš starý stav\n"
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "volání assuan_inquire(%s) selhalo: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr "chybí ldapserver (LDAP server)"
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr "v ID certifikátu chybí serialno (sériové číslo)"
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "volání assuan_inquire selhalo: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "volání fetch_cert_by_url selhalo: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, c-format
msgid "error sending data: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "volání start_cert_fetch selhalo: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "volání fetch_next_cert selhalo: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies (max. odpovědí) %d překročeno\n"
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "řídící strukturu nelze alokovat: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "alokace kontextu assuan selhala: %s\n"
+
++#: dirmngr/server.c:2430
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "inicializace serveru selhala: %s\n"
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "registrace příkazu u Assuanu selhala: %s\n"
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problém příjmu Assuanu: %s\n"
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@@ -9900,13 -7905,11 +10041,13 @@@ msgstr "Volby ovlivňující podobu vý
msgid "Options controlling the interactivity and enforcement"
msgstr "Volby ovlivňující interaktivitu a vymáhání"
+#: tools/gpgconf-comp.c:911
#, fuzzy
#| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr "Volby ovlivňující bezpečnost"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "Nastavení HTTP serverů"
diff --cc po/da.gmo
index bed4a1e,0000000..afbe6e5
mode 100644,000000..100644
Binary files differ
diff --cc po/da.po
index ce94b33,dc74dff..c224b73
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2012-11-01 20:27+0200\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@@ -83,7 -72,6 +83,7 @@@ msgstr "Indtast ny adgangsfrase
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Kvalitet:"
@@@ -93,7 -81,6 +93,7 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Denne række indikerer kvaliteten for ovenstående angivne adgangskode.\n"
@@@ -102,7 -89,6 +102,7 @@@
"specialtegn. Spørg din administrator om mere præcis information om\n"
"hvordan man anvender sikre adgangskoder."
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -110,7 -96,6 +110,7 @@@ msgstr "
"Indtast venligst din PIN, så at den hemmelige nøgle kan låses op for denne "
"session"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -118,53 -103,40 +118,53 @@@ msgstr "
"Indtast din adgangsfrase, så at den hemmelige nøgle kan låses op for denne "
"session"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Adgangsfrase:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "matcher ikke - prøv igen"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (forsøg %d af %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "PIN er for lang"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Adgangsfrase er for lang"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "Ugyldige tegn i PIN"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "PIN er for kort"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "Ugyldig PIN"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Ugyldig adgangsfrase"
@@@ -173,25 -144,11 +173,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -268,11 -212,9 +268,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "Indsæt venligst kortet med serielnummeret"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "Fjern venligst det aktuelle kort og indsæt det med serielnummeret"
@@@ -429,41 -345,27 +429,41 @@@ msgstr "
"@Indstillinger:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "kør i dæmontilstand (baggrunden)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "kør i servertilstand (forgrunden)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "uddybende"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "vær mindre uddybende"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "kommandoresultat i sh-stil"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "kommandoresultat i csh-stil"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FIL|læs tilvalg fra FIL"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "frakobl ikke fra konsollen"
@@@ -546,11 -431,6 +546,11 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
@@@ -572,151 -450,113 +572,150 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, 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:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "tilvalgsfil »%s«: %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke oprette sokkel: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, 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:1750
++#: agent/gpg-agent.c:1735
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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "fejl ved indhentelse af nonce for soklen\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, 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:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() mislykkedes: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, 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:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 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:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fejl ved læsning af nonce på fd %d: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "håndtering 0x%lx for fd %d startet\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "håndtering 0x%lx for fd %d termineret\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, 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:2288
++#: agent/gpg-agent.c:2273
#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, 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:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kører i denne session\n"
@@@ -732,8 -570,6 +731,8 @@@ msgstr "
"Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
"Adgangskode for mellemlagervedligeholdelse\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -741,9 -577,6 +740,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -800,7 -625,6 +799,7 @@@ msgstr "afbrudt\n
msgid "error while asking for the passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrasen: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -998,8 -788,6 +997,8 @@@ msgstr "fejl ved oprettelse af datakana
msgid "error creating a stream for a pipe: %s\n"
msgstr "fejl ved oprettelse af datakanal: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "fejl ved forgrening af proces: %s\n"
@@@ -1154,7 -910,6 +1153,7 @@@ msgstr "ingen kørende gpg-agent - star
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "venter %d sekunder på at agenten kommer frem\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1176,7 -928,6 +1175,7 @@@ msgstr "ingen kørende dirmngr - starte
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "venter %d sekunder på at agenten kommer frem\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1440,7 -1131,6 +1439,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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "uden for kerne\n"
@@@ -1625,19 -1277,14 +1624,19 @@@ msgstr "kunne ikke proxy %s-forespørgs
msgid "Enter passphrase: "
msgstr "Indtast adgangsfrase\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP-kort er ikke tilgængeligt: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnr. %s detekteret\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "kan ikke udføre dette i jobtilstand\n"
@@@ -1649,155 -1294,116 +1648,155 @@@ msgstr "Denne kommando er kun tilgænge
msgid "Reset Code not or not anymore available\n"
msgstr "Nulstillingskode er ikke eller ikke mere tilgængelig\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Dit valg? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[ikke indstillet]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "mand"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "kvinde"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "ikke angivet"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "ikke tvunget"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "tvunget"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Fejl: Kun ren ASCII er tilladt i øjeblikket.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Fejl: Tegnet »<« må ikke bruges.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Fejl: Dobbelt mellemrum er ikke tilladt.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Kortholders efternavn: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Kortholders fornavn: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Fejl: Kombineret navn er for langt (begrænsningen er på %d tegn).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "Adresse hvor offentlig nøgle skal hentes: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fejl: Adresse er for lang (begrænsningen er %d tegn).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "fejl ved allokering af nok hukommelse: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "fejl ved læsning af »%s«: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "fejl ved skrivning af »%s«: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Loginddata (kontonavn): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Fejl: Loginddata er for lange (begrænsningen er %d tegn).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Private DO-data: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Fejl: Privat DO er for lang (begrænsningen er %d tegn).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Sprogpræferencer: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Fejl: ugyldig længde for præferencestreng.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Fejl: ugyldige tegn i præferencestreng.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Køn ((M)and, Kvinde(F) eller mellemrum): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Fejl: ugyldigt svar.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "CA-fingeraftryk: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Fejl: Ugyldigt formateret fingeraftryk.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "nøglehandling er ikke mulig: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "ikke et OpenPGP-kort"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Erstat eksisterende nøgle? (j/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1813,58 -1419,46 +1812,58 @@@ msgstr "
" dokumentationen for dit kort for at se hvilke størrelser, der\n"
" er tilladt.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for underskriftsnøglen (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for krypteringsnøglen? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for godkendelsesnøglen? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "afrundet op til %u bit\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s nøglestørrelser skal være i intervallet %u-%u\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "fejl ved ændring af størrelsen på nøglen %d til %u bit: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"Lav sikkerhedskopi et andet sted end på kortet for krypteringsnøglen? (J/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Erstat eksisterende nøgler (j/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1879,145 -1473,110 +1878,145 @@@ msgstr "
" PIN = »%s« Admin-PIN = »%s«\n"
"Du bør ændre dem med kommandoen --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Vælg venligst hvilken slags nøgle der skal oprettes:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Underskriftsnøgle\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Krypteringsnøgle\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Godkendelsesnøgle\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Ugyldigt valg.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Vælg venligst hvor nøglen skal gemmes:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "læsning mislykkedes: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "afslut denne menu"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "vis administratorkommandoer"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "vis denne hjælpetekst"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "vis alle tilgængelige data"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "ændr kortholders navn"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "ændr adresse for at indhente nøgle"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "hent nøglen angivet i kortadressen"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "ændr logindnavnet"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "ændr sprogpræferencerne"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "ændr kortholders køn"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "ændr et CA-fingeraftryk"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "skift force PIN-flag for underskriften"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "opret nye nøgler"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "menu til at ændre eller fjerne blokering for PIN'en"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "verificer PIN'en og vis alle data"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "fjern blokering for PIN'en med en nulstillingskode"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "Kommandoer kun for administratoren\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Administratorkommandoer er tilladt\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Administratorkommandoer er ikke tilladt\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Ugyldig kommando (prøv »help«)\n"
@@@ -2025,76 -1583,63 +2024,83 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output virker ikke for denne kommando\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan ikke åbne »%s«\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "nøglen »%s« blev ikke fundet: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fejl ved læsning af nøgleblok: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "nøglen »%s« blev ikke fundet: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(med mindre du angiver nøglen med fingeraftryk)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "kan ikke udføre dette i jobtilstand uden »--yes«\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Slet denne nøgle fra nøgleringen? (j/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Dette er en hemmelig nøgle! - Slet? (j/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "deleting secret %s failed: %s\n"
msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr ""
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Pubkey: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "sletning af nøgleblok mislykkedes: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "information om ejertroværdighed ryddet\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "der er en hemmelig nøgle for offentlig nøgle »%s«!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
@@@ -2149,7 -1686,6 +2155,7 @@@ msgid "forcing symmetric cipher %s (%d
msgstr ""
"tvang for symmetrisk chiffer %s (%d) overtræder modtagerens præferencer\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "du kan ikke bruge %s i tilstanden %s\n"
@@@ -2238,273 -1758,227 +2244,294 @@@ msgstr "ADVARSEL: kan ikke fjerne midle
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "ADVARSEL: kan ikke fjerne midlertidig mappe »%s«: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "eksportunderskrifter som er markeret som kun lokale"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "bruger-id'er for eksportattributter (normalt billed-id'er)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "tilbagekaldsnøgler for eksport markeret som »sensitive«"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "fjern nøgledele der ikke kan bruges under eksport"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "fjern så meget som muligt fra nøglen under eksport"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "nøgle %s: nøgle i PGP 2.x-stil - udeladt\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "nøgle %s: nøglemateriale på kort - udeladt\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: udelod: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: intet blev eksporteret\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[Bruger-id blev ikke fundet]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "hentede automatisk »%s« via %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "fejl ved indhentelse af »%s« via %s: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "Ingen fingeraftryk"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "manglende parameter for indstilling »%.50s«\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Ugyldig nøgle %s gjort gyldig med --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "bruger undernøgle %s i stedet for primær nøgle %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "opret en underskrift"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "opret en underskrift i klartekst"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "opret en separat underskrift"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "krypter data"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "krypter kun med symmetrisk chiffer"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "afkrypter data (standard)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "godkend en underskrift"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "vis nøgler"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "vis nøgler og underskrifter"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "vis og kontroller nøgleunderskrifter"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "vis nøgler og fingeraftryk"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "vis hemmelige nøgler"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "opret et tilbagekaldscertifikat"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "fjern nøgler fra den offentlige nøglering"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "fjern nøgler fra den hemmelige nøglering"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "underskriv eller rediger en nøgle"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "ændr en adgangsfrase"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "eksporter nøgler"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "eksporter nøgler til en nøgletjener"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importer nøgler fra en nøgleserver"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "søg efter nøgler på en nøgleserver"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "opdater alle nøgler fra en nøgleserver"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importer/sammenføj nøgler"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "udskriv kortstatus"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "ændr data på et kort"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "ændr et korts PIN"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "opdater troværdighedsdatabasen"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "vis beskedsammendrag"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "kør i servertilstand"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "opret ascii-pansrede uddata"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|krypter for BRUGER-ID"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "brug kanonisk teksttilstand"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv resultat til FIL"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "lav ingen ændringer"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "spørg før overskrivning"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "brug streng OpenPGP-opførsel"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2512,7 -1986,6 +2539,7 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2532,14 -2005,12 +2559,14 @@@ msgstr "
" --list-keys [navne] vis nøgler\n"
" --fingerprint [navne] vis fingeraftryk\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2554,7 -2025,6 +2581,7 @@@ msgstr "
"Sign, check, encrypt eller decrypt\n"
"standardhandling afhænger af inddata\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2562,81 -2032,66 +2589,81 @@@ msgstr "
"\n"
"Understøttede algoritmer:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "brug: gpgsm [tilvalg] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "kommandoer er i konflikt\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2645,19 -2100,16 +2672,19 @@@ msgid "
msgstr ""
"ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2667,491 -2119,442 +2694,563 @@@ msgid "
msgstr ""
"ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "ukendt konfigurationspunkt »%s«\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "vis billed-id'er under nøglevisninger"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, 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:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "vil politikadresser under underskriftvisninger"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "vis alle notationer under underskriftvisninger"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotationer under underskriftvisninger"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "vis brugerangivne notationer under underskriftvisninger"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "vis bruger-id-validitet under nøglevisninger"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
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:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "vis nøgleringsnavnet i nøglevisninger"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "vis udløbsdatoer under underskriftvisninger"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "Tilgængelige nøgler:\n"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option `%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "ukendt tilvalg »%s«\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command `%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "ukendt kommando »%s«\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "tilvalg »%.50s« er tvetydigt\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
+
++#: g10/gpg.c:2423
#, 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:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "BEMÆRK: %s er ikke til normal brug!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, 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:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke fortolke nøgleserveradresse\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importindstillinger\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "ugyldige importindstillinger\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportindstillinger\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "ugyldige eksportindstillinger\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listeindstillinger\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "vis billed-id'er under underskriftverificering"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "vis politikadresser under underskriftverificering"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "vis alle notationer under underskriftverificering"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotationer under underskriftverificering"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "vis brugerangivne notationer under underskriftverificering"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "vis bruger-id-validitet under underskriftverificering"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr "vis kun den primære bruger-id i underskriftverificering"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "valider underskrifter med PKA-data"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke angive kørselssti til %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: program kan oprette en kernefil!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsløs sammen med %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kører med forfalsket systemtid: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "vil ikke køre med usikker hukommelse på grund af %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt chifferalgoritme er ugyldig\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "valgt sammendragsalgoritme er ugyldig\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed skal være større end 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed skal være større end 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth skal være i intervallet fra 1 til 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ugyldigt default-cert-level; skal være 0, 1, 2 eller 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ugyldigt min-cert-level; skal være 1, 2 eller 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "BEMÆRK: simpel S2K-tilstand (0) frarådes på det skarpeste\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K-tilstand; skal være 0, 1 eller 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "ugyldige standardpræferencer\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "ugyldige præferencer for personlig chiffer\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "ugyldige præferencer for personlig sammendrag\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "ugyldige præferencer for personlig komprimering\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker endnu ikke med %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TrustDB: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, 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/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, 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:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
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:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
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:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd <bruger-id>"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nøgleserver send mislykkedes: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nøgleserver modtag mislykkedes: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "nøgleeksport mislykkedes: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nøgleserver søg mislykkedes: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "nøgleserver opdater mislykkedes: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af panser mislykkedes: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "påklædning af panser mislykkedes: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ugyldig hash-algoritme »%s«\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Gå til sagen og skriv meddelelsen ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|FILE|tag nøglerne fra nøgleringsFILEN"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "giv kun tidsstempelkonflikter en advarsel"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation til denne FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Brug: gpgv [tilvalg] [filer] (-h for hjælp)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3329,7 -2698,6 +3428,7 @@@ msgstr "
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:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "nøgle %s: ingen bruger-id\n"
@@@ -3340,7 -2707,6 +3439,7 @@@
msgid "key %s: %s\n"
msgstr "udelod »%s«: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3363,7 -2725,6 +3462,7 @@@ msgstr "nøgle %s: ingen gyldige bruger
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes en manglende egenunderskrift\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nøgle %s: offentlig nøgle blev ikke fundet: %s\n"
@@@ -3373,262 -2733,225 +3472,277 @@@
msgid "key %s: new key - skipped\n"
msgstr "nøgle %s: ny nøgle - udeladt\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ingen skrivbar nøglering fundet: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "skriver til »%s«\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nøgle %s: offentlig nøgle »%s« importeret\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nøgle %s: stemmer ikke med vores kopi\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nøgle %s: »%s« 1 ny underskrift\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nøgle %s: »%s« %d nye underskrifter\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nøgle %s: »%s« 1 ny undernøgle\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nøgle %s: »%s« %d nye undernøgler\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nøgle %s: »%s« %d underskrift renset\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nøgle %s: »%s« %d underskrifter renset\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nøgle %s: »%s« %d bruger-id renset\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nøgle %s: »%s« ikke ændret\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nøgle %s: hemmelig nøgle importeret\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, 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:1663
++#: g10/import.c:1680
#, 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:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "import af hemmelige nøgler er ikke tilladt\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nøgle %s: ingen bruger-id for underskrift\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nøgle %s: ugyldig undernøglebinding\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nøgle %s: fjernet flerundernøglebinding\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nøgle %s: udeladt bruger-id »%s«\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nøgle %s: udeladt undernøgle\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
@@@ -3657,62 -2976,54 +3771,68 @@@ msgstr "nøgleboks »%s« oprettet\n
msgid "keyring '%s' created\n"
msgstr "nøglering »%s« oprettet\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "nøgleblokressource »%s«: %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening `%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "fejl ved åbning af »%s«: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "kunne ikke genbygge nøgleringsmellemlager: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[tilbagekald]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[egenunderskrift]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 ugyldig underskrift\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d ugyldige underskrifter\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d underskrifter er ikke kontrolleret på grund af manglende nøgler\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 underskrift er ikke kontrolleret på grund af en fejl\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d underskrifter er ikke kontrolleret på grund af fejl\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 bruger-id uden gyldig egenunderskrift detekteret\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d bruger-id'er uden gyldige egenunderskrifter detekteret\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3723,17 -3034,14 +3843,17 @@@ msgstr "
"andre brugers nøgler\n"
"(ved at kigge på pas, kontrollere fingeraftryk fra andre kilder etc.)\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Marginal troværdighed\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Fuld troværdighed\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3743,47 -3051,40 +3863,52 @@@ msgstr "
"En dybde større end 1 giver nøglen du underskriver mulighed for\n"
"at lavet troværdighedsunderskrifter på dine vegne.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Indtast venligst et domæne for at begrænse denne underskrift, eller retur "
"for ingen.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Bruger-id »%s« er tilbagekaldt."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Er du sikker på, at du stadig vil underskrive (j/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Kunne ikke underskrive.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Bruger-id »%s« er udløbet."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Bruger-id »%s« er ikke egenunderskrevet."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Bruger-id »%s« kan underskrives. "
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3792,11 -3093,9 +3917,11 @@@ msgstr "
"Egenunderskriften på »%s«\n"
"er en underskrift i PGP 2.x-stil.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Ønsker du at forfremme den til en OpenPGP-egenunderskrift? (j/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3805,12 -3104,10 +3930,12 @@@ msgstr "
"Din aktuelle underskrift på »%s«\n"
"er udløbet.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Ønsker du at udstede en ny underskrift for at erstatte den udløbne? (j/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3819,45 -3116,36 +3944,45 @@@ msgstr "
"Din aktuelle underskrift på »%s«\n"
"er en lokal underskrift.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Ønsker du at forfremme den til en fuld underskrift, der kan eksporteres (j/"
"N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "»%s« var allerede underskrevet lokalt af nøgle %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "»%s« var allerede underskrevet af nøgle %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Ønsker du at underskrive den igen alligevel? (j/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Intet at underskrive med nøgle %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Denne nøgle er udløbet!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Denne nøgle er ved at udløbe på %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Ønsker du at dine underskrifter skal udløbe på samme tidspunkt? (J/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3868,33 -3156,27 +3993,33 @@@ msgstr "
"faktisk tilhører personen navngivet ovenfor? Hvis du ikke kender svaret, så "
"indtast »0«.\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jeg vil ikke svare.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Jeg har ingen kontrol udført.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jeg har udført en overfladisk kontrol.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Jeg har foretaget en meget omhyggelig kontrol.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Dit valg? (indtast »?« for yderligere information): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3903,237 -3185,182 +4028,237 @@@ msgstr "
"Er du sikker på, at du ønsker at underskrive denne nøgle\n"
"med din nøgle »%s« (%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Dette vil være en egenunderskrift.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"ADVARSEL: Underskriften vil ikke blive markeret som ikke at kunne "
"eksporteres.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"ADVARSEL: Underskriften vil ikke blive markereret som ikke at kunne "
"tilbagekaldes.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "Underskriften vil blive markeret som ikke at kunne eksporteres.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "Underskriften vil blive markeret som ikke at kunne tilbagekaldes.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Jeg har overhovedet ikke kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "Jeg har overfladisk kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "Jeg har omhyggeligt kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "underskrift mislykkedes: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Nøgle har kun stump eller ikkekort nøgleposter - ingen adgangsfrase at "
"ændre.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "flytter en nøgleunderskrift til det korrekte sted\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "gem og afslut"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "vis nøglefingeraftryk"
# key grip
# chiefly ( US ) See also grip the person in charge of moving and setting up camera
# tracks and scenery in a film or television studio
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Indtst nøglegrebet: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "vis nøgle og bruger-id'er"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "vælg bruger-id N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "vælg undernøgle N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "kontroller underskrifter"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"underskriv valgte bruger-id'er [* se nedenfor for relaterede kommandoer]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "underskriv valgte bruger-id'er lokalt"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "underskriv valgte bruger-id'er med en troværdighedsunderskrift"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "underskriv bruger-id'er md en underskrift der ikke kan kaldes tilbage"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "tilføj bruger-id"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "tilføj billed-id"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "slet valgte bruger-id'er"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "tilføj en undernøgle"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "tilføj en nøgle til et smartkort"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "flyt en nøgle til et smartkort"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "flyt en sikkerhedskopinøgle til et smartkort"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "slet valgte undernøgler"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "tilføj en tilbagekaldsnøgle"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "slet underskrifter fra de valgte bruger-id'er"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "ændr udløbsdatoen for nøglen eller valgte undernøgler"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "marker den valgte bruger-id som primær"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "vis præferencer (ekspert)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "vis præferencer (uddybende)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "angiv præferenceliste for de valgte bruger-id'er"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "angiv den foretrukne nøgleserveradresse for de valgte bruger-id'er"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "angiv en notation for de valgte bruger-id'er"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "ændr adgangsfrasen"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "ændr ejertroværdigheden"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "tilbagekald underskrifter på de valgte bruger-id'er"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "tilbagekald valgte bruger-id'er"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "tilbagekald nøgle eller valgte undernøgler"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "aktiver nøgle"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "deaktiver nøgle"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "vis valgte billed-id'er"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"komprimer ubrugelige bruger-id'er og fjern ubrugelige underskrifter fra nøgle"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"komprimer ubrugelige bruger-id'er og fjern alle underskrifter fra nøgle"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Hemmelig nøgle er tilgængelig.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Har brug for den hemmelige nøgle for dette.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4154,256 -3381,200 +4279,257 @@@ msgstr "
"tnrsign\n"
" etc.).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Nøglen er tilbagekaldt."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Fif: Vælg bruger-id'erne at underskrive\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Ukendt underskrifttype »%s«\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Du skal vælge mindst en bruger-id.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Du kan ikke slette den sidste bruger-id!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Vil du virkelig fjerne alle valgte bruger-id'er? (j/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Vil du virkelig fjerne denne bruger-id? (j/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Du skal vælge præcis en nøgle.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "Kommando forventer en filnavnsparameter\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "Kan ikke åbne »%s«: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Fejl ved læsning af sikkerhedskopinøgle fra »%s«: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Du skal vælge mindst en nøgle.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vil du virkelig slette denne nøgle? (j/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Vil du virkelig tilbagekalde alle valgte bruger-id'er? (j/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Vil du virkelig tilbagekalde dette bruger-id? (j/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Vil du virkelig tilbagekalde hele nøglen? (j/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Vil du virkelig tilbagekalde de valgte undernøgler? (j/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vil du virkelig tilbagekalde denne undernøgle? (j/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Ejertroværdighed kan ikke indstilles, når der bruges en brugerleveret "
"troværdighedsdatabase\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Angiv præferenceliste til:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Opdater præferencerne for de valgte bruger-id'er (j/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Opdater præferencerne? (j/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Gem ændringer? (j/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Afslut uden at gemme? (j/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "opdatering mislykkedes: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ugyldig fingeraftryk"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "kunne ikke indhente fingeraftrykket\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Ingen sådan bruger-id.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Intet at underskrive med nøgle %s\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Sammendrag: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Funktioner: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Nøgleserver no-modify"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Fortrukken nøgleserver: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Notationer: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Der er ingen præferencer på en bruger-id i PGP 2.x-stil.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Den følgende nøgle blev tilbagekaldt den %s af %s nøgle %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Denne nøgle er tilbagekaldt af %s nøgle %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(sensitiv)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "oprettet: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "tilbagekaldt: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "udløbet: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "udløber: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "brug: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "kortnr.: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "troværdighed: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "validitet: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Denne nøgle er blevet deaktiveret"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4411,17 -3582,12 +4537,17 @@@ msgstr "
"Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
"korrekt med mindre du genstarter programmet.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "tilbagekaldt"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "udløbet"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4429,17 -3595,14 +4555,17 @@@ msgstr "
"ADVARSEL: Intet bruger-id er blevet markeret som primær. Denne kommando\n"
" kan medføre at et anden bruger-id bliver den formodede primære.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4449,78 -3612,61 +4575,78 @@@ msgstr "
"medføre at\n"
" nogle version af PGP afviser denne nøgle.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Er du sikker på, at du stadig ønsker at tilføje den? (j/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Du må ikke tilføje et billed-id til en nøgle i PGP2-stil.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Slet denne gode underskrift? (j/N/a)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Slet denne ugyldige underskrift? (j/N/a)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Slet denne ukendte underskrift? (j/n/a)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Virkelig slette denne egenunderskrift? (j/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Slettede %d underskrift.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Slettede %d underskrifter.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Intet slettet.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "ugyldig"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Bruger-id »%s« komprimeret: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Bruger-id »%s«: %d underskrift fjernet\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Bruger-id »%s«: %d underskrifter fjernet\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Bruger-id »%s«: allerede minimeret\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Bruger-id »%s«: allerede ryddet\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4530,190 -3676,161 +4656,203 @@@ msgstr "
"tilbagekalder\n"
" kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Du må ikke tilføje en dedikeret tilbagekalder til en nøgle i PGP 2.x-stil.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "kan ikke udpege en nøgle i PGP 2.x-stil som dedikeret tilbagekalder\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "du kan ikke udpege en nøgle som dets egen dedikerede tilbagekalder\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "denne nøgle er allerede blevet dedikeret som en tilbagekalder\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"ADVARSEL: Udpegning af en nøgle som en dedikeret tilbagekalder kan ikke "
"fortrydes!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
"tilbagekalder? (j/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Vælg venligst højst en undernøgle.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
+ "tilbagekalder? (j/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"undernøgle %s underskriver ikke og skal derfor ikke være krydscertificeret\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Vælg venligst præcis en bruger-id.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Indtast din foretrukne nøglerserveradresse: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Er du sikker på, at du ønsker at erstatte den? (j/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Er du sikker på, at du ønsker at slette den? (j/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Indtast notationen: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "Fortsæt? (j/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen bruger-id med indeks %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen bruger-id med hash %s\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Ingen undernøgle med indeks %d\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen undernøgle med indeks %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "bruger-id: »%s«\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "underskrevet af din nøgle %s den %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (kan ikke eksporteres)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne underskrift udløb den %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Er du sikker på, at du ønsker at tilbagekalde den? (j/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "Ikke underskrevet af dig.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Du har underskrevet disse bruger-id'er på nøgle %s:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (kan ikke tilbagekaldes)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "tilbagekaldt af din nøgle %s på %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "ingen hemmelig nøgle\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"ADVARSEL: En bruger-id-underskrift er dateret %d sekunder inde i fremtiden\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Nøgle %s er allerede tilbagekaldt.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Viser %s billed'id med størrelse %ld for nøgle %s (uid %d)\n"
@@@ -4754,14 -3863,10 +4893,14 @@@ msgstr "skriver egenunderskrift\n
msgid "writing key binding signature\n"
msgstr "skriver underskrift for nøglebinding\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nøglestørrelse afrundet op til %u bit\n"
@@@ -5062,41 -4118,36 +5201,46 @@@ msgstr "
msgid "Real name: "
msgstr "Fødselsnavn: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Ugyldige bogstaver i navn\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Navn må ikke starte med et tal\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Navn skal være mindst 5 bogstaver langt\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "E-post-adresse: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig e-post-adresse\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Ugyldigt tegn i kommentar\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Du bruger tegnsættet »%s«.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5107,7 -4158,6 +5251,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Placer ikke e-post-adressen i fødselsnavnet eller kommentaren\n"
@@@ -5122,35 -4172,28 +5266,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Ret venligst fejlen først\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5158,7 -4201,6 +5302,7 @@@ msgstr "
"Du skal bruge en adgangsfrase til at beskytte din hemmelige nøgle.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@@ -5166,16 -4208,13 +5310,16 @@@ msgstr "
"Indtast venligst en adgangsfrase til at beskytte sikkerhedskopien fortaget "
"uden for kortet af den nye krypteringsnøgle."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "adgangsfrasen er ikke korrekt gentaget; prøv igen"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5187,7 -4226,6 +5331,7 @@@ msgstr "
"ethvert tidspunkt ved at bruge dette program med tilvalget\n"
"»--edit-key«.\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5199,12 -4237,10 +5343,12 @@@ msgstr "
"under oprettelse af primtallet; dette giver det vilkårlig\n"
"taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nøgleoprettelse mislykkedes: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5212,59 -4248,48 +5356,59 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "nøgle findes allerede\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Brug denne nøgle alligevel? (j/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "opretter ny nøgle\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Nøgleoprettelse annulleret.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "skriver offentlig nøgle til »%s«\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "fejl ved skrivning af offentlig nøglering »%s«: %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5272,7 -4297,6 +5416,7 @@@ msgstr "
"Bemærk at denne nøgle ikke kan bruges til kryptering. Du kan bruge\n"
"kommandoen »--edit-key« til at oprette en undernøgle til dette formål.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5280,7 -4304,6 +5424,7 @@@ msgstr "
"nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5288,246 -4311,194 +5432,246 @@@ msgstr "
"nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"BEMÆRK: Oprettelse af undernøgler for v3-nøgler overholder ikke OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Hemmelige dele for primær nøgle er ikke tilgængelige.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemmelige dele for primær nøgle gemmes på kortet.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Vil du virkelig oprette? (j/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "lagring af nøgle på kort mislykkedes: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "kan ikke oprette sikkerhedskopifil »%s«: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "BEMÆRK: sikkerhedskopi af kortnøgle gemt på »%s«\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "aldrig "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritisk underskriftspolitik: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Underskriftspolitik: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Kritisk foretrukken nøgleserver: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritisk underskriftnotation: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Underskriftsnotation: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 ugyldig underskrift\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d ugyldige underskrifter\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Nøglering"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "udelod »%s«: %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Primær nøglefingeraftryk:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Undernøglefingeraftryk:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr "Primær nøglefingeraftryk:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Undernøglefingeraftryk:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Nøglefingeraftryk ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " Serielnr. for kort ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "mellemlagrer nøglering »%s«\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu nøgler mellemlagret indtil nu (%lu underskrifter)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu nøgler mellemlagret (%lu underskrifter)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: nøglering oprettet\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "inkluder tilbagekaldte nøgler i søgeresultater"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "inkluder undernøgler når der søges efter nøgle-id"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "hent automatisk nøgler når der verificeres underskrifter"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "overhold den foretrukne nøglerserveradresse angivet på nøglen"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "overhold PKA-posten angivet på en nøgle når der hentes nøgler"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "deaktiveret"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Indtal tal, N)æste eller Q) for Afslut > "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ugyldig nøgleserverprotokol (os %d!=håndtag %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "»%s« er ikke et nøgle-id: udelader\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "opdaterer 1 nøgle fra %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ADVARSEL: Kan ikke opdatere nøgle %s via %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "opdaterer %d nøgler fra %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "nøgle »%s« blev ikke fundet på nøgleserver\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "nøgle blev ikke fundet på nøgleserver\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen kendt nøgleserver (brug tilvalget --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "anmoder om nøgle %s fra %s server %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "anmoder om nøgle %s fra %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "sender nøgle %s til %s server %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "sender nøgle %s til %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "anmoder om nøgle %s fra %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
@@@ -5561,7 -4526,6 +5705,7 @@@ msgstr "krypterede data for offentlig n
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "krypteret med %u-bit %s nøgle, id %s, oprettet %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " »%s«\n"
@@@ -5608,261 -4563,210 +5752,262 @@@ msgstr "afkryptering okay\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "ryddet adgangsfrase mellemlagret med id: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "afkryptering mislykkedes: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "BEMÆRK: afsender anmodte om »for-your-eyes-only«\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "oprindeligt filnavn=»%.*s«\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "ADVARSEL: flere klartekster set\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "uafhængig tilbagekald - brug »gpg --import« for at anvende\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "ingen underskrift fundet\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "UGYLDIG underskrift fra »%s«"
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Udløbet underskrift fra »%s«"
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "God underskrift fra »%s«"
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "underskriftverificering undertrykt\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Underskrift lavet %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " bruger %s nøgle %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Nøgle tilgængelig på: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " også kendt som »%s«"
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Underskrift udløbet %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Underskrift udløber %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binær"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "tekstilstand"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "ukendt"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritme: %s"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan ikke kontrollere underskrift: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "ikke en frakoblet underskrift\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "uafhængig underskrift for klasse 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "gammeldags (PGP 2.x) underskrift\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
#| msgid "fstat of `%s' failed in %s: %s\n"
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "fstat for »%s« mislykkedes i %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) mislykkedes i %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "ADVARSEL: bruger eksperimentel offentlig nøglealgoritme %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "ADVARSEL: Elgamalnøgler for underskriv+krypter er forældede\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "ADVARSEL: bruger eksperimentel chifferalgoritme %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "ADVARSEL: bruger eksperimentel sammendragsalgoritme %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "ADVARSEL: sammendragsalgoritme %s er forældet\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s underskrift, sammendragsalgoritme %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: forældet indstilling »%s«\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "brug venligst »%s%s« i stedet for\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "ADVARSEL: »%s« er en forældet kommando - brug den ikke\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Ukomprimeret"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "ukomprimeret|ingen"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "denne besked kan nok ikke bruges af %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "tvetydigt tilvalg »%s«\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "ukendt tilvalg »%s«\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA kræver at hashlængden skal gå op i 8 bit\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type `%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Ukendt underskrifttype »%s«\n"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6066,31 -4937,24 +6211,31 @@@ msgstr "Er dette billede korrekt (j/N/a
msgid "unable to display photo ID!\n"
msgstr "kan ikke vise billed-id!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Ingen årsag angivet"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Nøglen er blevet afløst"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Nøglen er blevet komprimeret"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Nøglen bruges ikke længere"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Bruger-id er ikke længere gyldigt"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "årsag for tilbagekald: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "tilbagekaldskommentar: "
@@@ -6105,54 -4969,43 +6250,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Ingen tillidsværdi tildelt til:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " også kendt som »%s«\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"Hvor stor er din tillid til at denne nøgle rent faktisk tilhører den "
"navngivne ejer?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Jeg ved det ikke eller vil ikke sige det\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Jeg stoler IKKE på denne nøgle\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Jeg stoler fuldstændig på denne nøgle\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " h = tilbage til hovedmenuen\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = udelad denne nøgle\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " a = afslut\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6161,40 -5014,32 +6306,40 @@@ msgstr "
"Minimumstroværdighedsniveau for denne nøgle er: %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Dit valg? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Vil du virkelig gerne give denne nøgle ultimativ troværdighed? (j/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certifikater der fører til en ultimativ troværdig nøgle:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: Der er ingen garanti for, at denne nøgle tilhører den navngivne bruger\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: Der er begrænset garanti for, at denne nøgle tilhører den navngivne "
"bruger\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Denne nøgle tilhører sikkert den navngivne bruger\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Denne nøgle tilhører os\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6204,121 -5049,96 +6349,121 @@@ msgstr "
"i bruger-id'et. Hvis du *virkelig* ved hvad du gør,\n"
"så kan du besvare det næste spørgsmål med ja.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "Brug denne nøgle alligevel? (j/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "ADVARSEL: Bruger nøgle uden troværdighed!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " Dette kan betyde at underskriften er forfalsket.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Bemærk: Denne nøgle er blevet deaktiveret.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, 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:588
++#: g10/pkclist.c:589
#, 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:600
++#: g10/pkclist.c:601
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:608
++#: g10/pkclist.c:609
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:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Bemærk: Denne nøgle er forældet!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ADVARSEL: Vi tror IKKE på denne nøgle!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen er formentlig FORFALSKET.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: udelod: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: udelod: offentlig nøgle er slået fra\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: udelod: offentlig nøgle er allerede til stede\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Aktuelle modtagere:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6326,75 -5146,58 +6471,75 @@@ msgstr "
"\n"
"Indtast bruger-id'et. Slut med en tom linje: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Ingen sådan bruger-id.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "udeladt: offentlig nøgle er allerede valgt som standardmodtager\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Offentlig nøgle er slået fra.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "udelod: offentlig nøgle er allerede angivet\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "ukendt standardmodtager »%s«\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "ingen gyldige adresser\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, 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:1566
++#: g10/pkclist.c:1568
#, 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"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "data ej gemt; brug tilvalg »--output« for at gemme\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "fejl ved oprettelse af »%s«: %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Frakoblet underskrift.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Indtast navn for datafil: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "læser stdin ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "ingen underskrevne data\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "kan ikke åbne underskrevne data »%s«\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan ikke åbne underskrevne data fd=%d: %s\n"
@@@ -6434,8 -5230,6 +6579,8 @@@ msgstr "BEMÆRK: hemmelig nøgle %s udl
msgid "Note: key has been revoked"
msgstr "BEMÆRK: nøgle er blevet tilbagekaldt"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet mislykkedes: %s\n"
@@@ -6445,43 -5238,39 +6590,49 @@@
msgid "key %s has no user IDs\n"
msgstr "nøgle %s har ingen bruger-id'er\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Tilbagekaldes af:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Dette er en sensitiv tilbagekaldsnøgle)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Hemmelig nøgle er tilgængelig.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Opret et designet tilbagekaldscertifikat for denne nøgle? (j/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "ASCII-pansret resultat er tvunget.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet mislykkedes: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Tilbagekaldscertifikat oprettet.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "ingen tilbagekaldsnøgler fundet for »%s«\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6489,18 -5278,27 +6640,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6519,33 -5317,26 +6684,33 @@@ msgstr "
"forsigtig: Dit udskrivningssystem kan gemme dataene og gøre dem\n"
"tilgængelige for andre!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Vælg venligst årsagen for tilbagekaldet:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Afbryd"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Du vil sikkert vælge %d her)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Indtast en valgfri beskrivelse; afslut den med en tom linje:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Årsag for tilbagekald: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Ingen beskrivelse angivet)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Er dette okay? (j/N) "
@@@ -6570,37 -5357,30 +6735,37 @@@ msgstr "%s-nøglen bruger en usikker (%
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "DSA-nøgle %s kræver en %u bit eller større hash\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "ADVARSEL: konflikt for underskriftssammendrag i besked\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "ADVARSEL: underskriftsundernøgle %s er ikke krydscertificeret\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "se venligst %s for yderligere information\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"ADVARSEL: underskriftsundernøgle %s har en ugyldig krydscertificering\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "offentlig nøgle %s er %lu sekunder nyere end underskrift\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6608,7 -5388,6 +6773,7 @@@ msgstr "
"nøgle %s blev oprettet %lu sekund inde i fremtiden (tidsforskydning eller et "
"problem med uret)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6616,31 -5395,26 +6781,31 @@@ msgstr "
"nøgle %s blev oprettet %lu sekunder inde i fremtiden (tidsforskydning eller "
"et problem med uret)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "BEMÆRK: underskriftnøgle %s udløb %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "BEMÆRK: underskriftnøgle %s er blevet tilbagekaldt\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"antager ugyldig underskrift fra nøgle %s på grund af en ukendt kritisk del\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"nøgle %s: ingen undernøgle til tilbagekaldsunderskrift for undernøgle\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "nøgle %s: ingen undernøgle til bindingsunderskrift for undernøgle\n"
@@@ -6685,31 -5453,25 +6850,31 @@@ msgstr "
msgid "signing:"
msgstr "underskriver:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s-kryptering vil blive brugt\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"nøgle er ikke markeret som usikker - kan ikke bruge den med falsk RNG!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "udelod »%s«: duplikeret\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "udelod: hemmelig nøgle er allerede til stede\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"dette er en PGP-oprettet Elgamalnøgle som ikke er sikker for underskrifter!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "stol på post %lu, type %d: skrivning mislykkedes: %s\n"
@@@ -6757,7 -5511,6 +6922,7 @@@ msgstr "fejl under forsøg på at find
msgid "read error in '%s': %s\n"
msgstr "læsefejl i »%s«: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronisering mislykkedes: %s\n"
@@@ -6788,7 -5536,6 +6953,7 @@@ msgstr "trustdb rec %lu: skrivning misl
msgid "trustdb transaction too large\n"
msgstr "transaktion for trustdb er for stor\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -6905,117 -5629,94 +7070,117 @@@ msgstr "kan ikke håndtere tekstlinjer
msgid "input line longer than %d characters\n"
msgstr "inddatalinje er længere end %d tegn\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "»%s« er ikke et gyldigt nøgle-id\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "nøgle %s: accepteret som troværdig nøgle\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "nøgle %s fremgår mere end en gang i trustdb\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "nøgle %s: ingen offentlig nøgle for troværdig nøgle - udeladt\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "nøgle %s markeret som ultimativ troværdig\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "troværdighedspost %lu, req-type %d: læsning mislykkedes: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "troværdighedspost %lu er ikke af den anmodne type %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "Du kan forsøge at genskabe trustdb med kommandoerne:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "Hvis det ikke virker, så se venligst manualen\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"kan ikke bruge ukendt troværdighedsmodel (%d) - antager %s "
"troværdighedsmodel\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "bruger %s troværdighedsmodel\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "intet behov for kontrol af trustdb\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "næste kontrol af trustdb sker den %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
#| msgid "no need for a trustdb check with `%s' trust model\n"
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "intet behov for kontrol af trustdb med troværdighedsmodellen »%s«\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
#| msgid "no need for a trustdb update with `%s' trust model\n"
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr ""
"intet behov for en opdatering af trustdb med troværdighedsmodellen »%s«\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "udfør venligst en --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "kontrollerer trustdb\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d nøgler behandlet (%d validiteter ryddet)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "ingen ultimativ troværdige nøgler fundet\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "offentlig nøgle for ultimativ troværdig nøgle %s blev ikke fundet\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "%d marginaler krævet, %d færdiggjorte krævet, %s troværdighedsmodel\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7023,7 -5724,6 +7188,7 @@@ msgstr "
"dybde: %d gyldig: %3d underskrevet: %3d troværdighed: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
@@@ -7266,11 -5917,9 +7431,11 @@@ msgstr "PIN for CHV%d er for kort; mini
msgid "verify CHV%d failed: %s\n"
msgstr "verificering af CHV%d mislykkedes: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "fejl ved indhentelse af CHV-status fra kort\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "kort er permanent låst!\n"
@@@ -7401,14 -6022,12 +7566,14 @@@ msgstr "kort understøtter ikke sammend
msgid "signatures created so far: %lu\n"
msgstr "underskrifter oprettet indtil videre: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"verifikation af administrator-PIN er i øjeblikket forbudt via denne "
"kommando\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@@ -7428,7 -6044,6 +7593,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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
@@@ -7494,12 -6097,10 +7659,12 @@@ msgid "please use the option '--daemon
msgstr ""
"brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "håndtering for fd %d startet\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "håndtering for fd %d termineret\n"
@@@ -7932,7 -6441,6 +8097,7 @@@ msgstr "linje %d: fejl ved indhentelse
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "linje %d: nøgleoprettelse mislykkedes: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8547,7 -6935,6 +8712,7 @@@ msgstr "Inkluderede certifikater
msgid " runtime cached certificates: %u\n"
msgstr "antallet af matchende certifikater: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -8559,8 -6945,6 +8724,8 @@@ msgstr " (certifkat oprettet den
msgid "certificate cached\n"
msgstr "certifikat er gyldigt\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -8632,7 -7005,6 +8797,7 @@@ msgstr "modtagelse af linje mislykkedes
msgid "not removing file '%s'\n"
msgstr "påklædning af panser mislykkedes: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing cache file: %s\n"
@@@ -8877,240 -7205,197 +9042,240 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "fejl ved indhentelse af gemte flag: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "ugyldig hash-algoritme »%s«\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr ""
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
#| msgid "iconv_open failed: %s\n"
msgid "converting S-expression failed: %s\n"
msgstr "iconv_open mislykkedes: %s:\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "creating S-expression failed: %s\n"
msgstr "modtagelse af linje mislykkedes: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet mislykkedes: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
#| msgid "error getting serial number of card: %s\n"
msgid "error getting update times of CRL: %s\n"
msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting CRL item: %s\n"
msgstr "fejl ved indhentelse af ny PIN: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error inserting item into temporary cache file: %s\n"
msgstr "fejl ved skrivning til midlertidig fil: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
#| msgid "no issuer found in certificate"
msgid "no CRL issuer found in CRL: %s\n"
msgstr "ingen udsteder fundet i certifikat"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "underskriftverificering undertrykt\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
#| msgid "error reading list of trusted root certificates\n"
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "ksba_crl_new failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "læsning mislykkedes: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "removed stale temporary cache file '%s'\n"
msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating temporary cache file '%s': %s\n"
msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "opdatering af hemmelighed mislykkedes: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "fejl ved skrivning til midlertidig fil: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error closing temporary cache file '%s': %s\n"
msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
#| msgid "error reading input: %s\n"
msgid "error reading CRL extensions: %s\n"
msgstr "fejl ved læsning af inddata: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "creating cache file '%s'\n"
msgstr "fejl ved oprettelse af datakanal: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid notation data found\n"
msgid " WARNING: invalid cache record length\n"
msgstr "ADVARSEL: Ingen notationsdata fundet\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
#| msgid "error reading the card: %s\n"
msgid "problem reading cache record: %s\n"
msgstr "fejl ved læsning af kort: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
#| msgid "problem re-searching certificate: %s\n"
msgid "problem reading cache key: %s\n"
msgstr "problem under gensøgning af certifikat: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
#| msgid "error reading nonce on fd %d: %s\n"
msgid "error reading cache entry from db: %s\n"
msgstr "fejl ved læsning af nonce på fd %d: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "crl_fetch via DP failed: %s\n"
msgstr "læsning mislykkedes: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9160,84 -7435,68 +9325,84 @@@ msgstr "fejl ved indhentelse af »%s«
msgid "error retrieving '%s': http status %u\n"
msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
#| msgid "certificate `%s' not found: %s\n"
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "certifikat »%s« blev ikke fundet: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
#| msgid "certificate `%s' not found: %s\n"
msgid "certificate search not possible due to disabled %s\n"
msgstr "certifikat »%s« blev ikke fundet: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
#| msgid " (certificate created at "
msgid "add a certificate to the cache"
msgstr " (certifkat oprettet den "
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
#| msgid "Included certificates"
msgid "validate a certificate"
msgstr "Inkluderede certifikater"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
#| msgid "Included certificates"
msgid "lookup a certificate"
msgstr "Inkluderede certifikater"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
#| msgid "Included certificates"
msgid "lookup only locally stored certificates"
msgstr "Inkluderede certifikater"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "load a CRL into the dirmngr"
msgstr "send en kommando til dirmngr'en"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
#| msgid "export certificates"
msgid "expect certificates in PEM format"
msgstr "eksporter certifikater"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9245,247 -7504,172 +9410,216 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error reading certificate from stdin: %s\n"
msgstr "fejl ved lagring af certifikat: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
#| msgid "error reading from %s: %s\n"
msgid "error reading certificate from '%s': %s\n"
msgstr "fejl ved læsning fra %s: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "kan ikke forbinde til »%s«: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "opdatering mislykkedes: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "loading CRL '%s' failed: %s\n"
msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "validation of certificate failed: %s\n"
msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "certifikat er gyldigt\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
#| msgid "certificate has been revoked"
msgid "certificate has been revoked\n"
msgstr "certifikat er blevet tilbagekaldt"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "certificate check failed: %s\n"
msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "fejl ved skrivning af hemmelig nøglering »%s«: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, 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/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- #, fuzzy
- #| msgid "no running dirmngr - starting `%s'\n"
- msgid "no running dirmngr - starting one\n"
- msgstr "ingen kørende dirmngr - starter »%s«\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- #| msgid "malformed DIRMNGR_INFO environment variable\n"
- msgid "malformed %s environment variable\n"
- msgstr "forkert udformet DIRMNGR_INFO-miljøvariabel\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "dirmngr-protokolversion %d er ikke understøttet\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "kan ikke forbinde til dirmngr - forsøger reserve\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "kan ikke forbinde til »%s«: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "ikke understøttet algoritme: %s"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: 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:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, 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:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "send en kommando til dirmngr'en"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|skriv servertilstandslogge til FIL"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Afslut uden at gemme? (j/N) "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "tillad PKA-opslag (DNS-forespørgsler)"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, 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:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 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:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|brug nøgleserver på adressen"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9498,13 -7682,11 +9632,13 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, 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:352
++#: dirmngr/dirmngr.c:355
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -9516,88 -7698,71 +9650,88 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, 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:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "brug: gpgsm [tilvalg] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, 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:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, 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:1582
++#: dirmngr/dirmngr.c:1591
#, 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:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "ugyldig fingeraftryk"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, 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:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "ikke tvunget"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9866,12 -7980,10 +10000,12 @@@ msgstr "sender nøgle %s til %s server
msgid "malloc failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9909,11 -8015,11 +10043,13 @@@ msgstr "fejl ved læsning fra %s: %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr "Fejl: Privat DO er for lang (begrænsningen er %d tegn).\n"
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ #| msgid "certificate `%s' not found: %s\n"
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "certifikat »%s« blev ikke fundet: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -10080,80 -8156,70 +10216,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "afsendelse af linje mislykkedes: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "afsendelse af linje mislykkedes: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, 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:2304
++#: dirmngr/server.c:2409
+ #, 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:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10422,13 -8428,11 +10564,13 @@@ msgstr "Tilvalg der kontrollerer format
msgid "Options controlling the interactivity and enforcement"
msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
+#: tools/gpgconf-comp.c:911
#, fuzzy
#| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr "Tilvalg der kontrollerer sikkerheden"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "Konfiguration for HTTP-servere"
diff --cc po/de.gmo
index ac58340,0000000..460ed3c
mode 100644,000000..100644
Binary files differ
diff --cc po/de.po
index 050fad6,7d3e301..bcb3fca
--- 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: 2015-10-09 17:17+0200\n"
- "PO-Revision-Date: 2015-10-06 12:50+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
+ "PO-Revision-Date: 2015-12-03 17:23+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "Passphrase unsichtbar machen
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Qualität:"
@@@ -80,14 -68,12 +80,14 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Die Qualität der Passphrase, die Sie oben eingegeben haben.\n"
"Bitte fragen sie Ihren Systembeauftragten nach den\n"
"Kriterien für die Messung der Qualität."
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -95,7 -81,6 +95,7 @@@ msgstr "
"Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
"kann"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -103,53 -88,40 +103,53 @@@ msgstr "
"Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
"werden kann."
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Passphrase:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (Versuch %d von %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr "Nochmal:"
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "Die PIN ist zu lang"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Das Mantra (Passphrase) ist zu lang!"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "Ungültige Zeichen in der PIN!"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "Die PIN ist zu kurz!"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "Falsche PIN!"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Falsche Passphrase!"
@@@ -158,24 -129,10 +158,24 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, c-format
msgid "can't create '%s': %s\n"
msgstr "'%s' kann nicht erzeugt werden: %s\n"
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@@ -253,11 -197,9 +253,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "Die legen Sie die Karte mit der folgenden Seriennummer ein:"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
"Bitte entfernen Sie die vorhanden Karte und legen Sie die mit der folgenden "
@@@ -399,41 -315,27 +399,41 @@@ msgstr "
"@Optionen:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "Im Daemon Modus ausführen"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "Im Server Modus ausführen"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "Detaillierte Informationen"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "Reduzierte Informationen"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "Ausgabe für /bin/sh"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "Ausgabe für /bin/csh"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "Im Vordergrund laufen lassen"
@@@ -508,11 -393,6 +508,11 @@@ msgstr "PuTTY Unterstützung einschalte
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -530,138 -408,100 +530,137 @@@ msgstr "
"Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
- #: agent/gpg-agent.c:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, c-format
msgid "option file '%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
- #: agent/gpg-agent.c:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "Socket kann nicht erzeugt werden: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "Der Name des Sockets `%s' ist zu lang\n"
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, 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:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "Es wird auf Socket `%s' gehört\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "Verzeichnis `%s' erzeugt\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, 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:2288
++#: agent/gpg-agent.c:2273
#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "Der gpg-agent läuft nicht für diese Session\n"
@@@ -677,8 -515,6 +676,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
"Kennwortpuffer-Pflege\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -686,9 -522,6 +685,9 @@@ msgstr "
"@Befehle:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -744,7 -569,6 +743,7 @@@ msgstr "Vom Benutzer abgebrochen\n
msgid "error while asking for the passphrase: %s\n"
msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, c-format
msgid "error opening '%s': %s\n"
msgstr "Fehler beim Öffnen von `%s': %s\n"
@@@ -939,8 -729,6 +938,8 @@@ msgstr "Fehler beim Erzeugen einer \"Pi
msgid "error creating a stream for a pipe: %s\n"
msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
@@@ -1089,7 -845,6 +1088,7 @@@ msgstr "Kein aktiver gpg-agent - `%s' w
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "Warte bis der gpg-agent bereit ist ... (%ds)\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr "Verbindung zum gpg-agent aufgebaut\n"
@@@ -1107,7 -859,6 +1106,7 @@@ msgstr "Kein aktiver Dirmngr - `%s' wir
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "Warte bis der Dirmngr bereit ist ... (%ds)\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr "Verbindung zum Dirmngr aufgebaut\n"
@@@ -1365,7 -1056,6 +1364,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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "Nicht genügend Speicher\n"
@@@ -1544,19 -1196,14 +1543,19 @@@ msgstr "Die %s \"inquiry\" konnte nich
msgid "Enter passphrase: "
msgstr "Geben Sie die Passphrase ein: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP Karte Nr. %s erkannt\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
@@@ -1568,154 -1213,115 +1567,154 @@@ msgstr "Dieser Befehl ist nur für Kart
msgid "Reset Code not or not anymore available\n"
msgstr "Der Rückstellcode ist nicht vorhanden\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ihre Auswahl? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[nicht gesetzt]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "männlich"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "weiblich"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "unbestimmt"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "nicht zwingend"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "zwingend"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Familienname des Kartenbesitzers:"
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Vorname des Kartenbesitzers:"
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
"Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "URL um den öffentlichen Schlüssel zu holen: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, c-format
msgid "error reading '%s': %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "Fehler beim Schreiben von %s: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Logindaten (Kontenname): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Geheime DO-Daten: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Spracheinstellungen"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Fehler: ungültige Antwort.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "CA-Fingerabdruck: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "Schlüsseloperation nicht möglich: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "Keine gültige OpenPGP-Karte"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1727,60 -1333,48 +1726,60 @@@ msgstr "
" fehlschlagen, so ziehen Sie bitte die Dokumentation Ihrer Karte\n"
" zu Rate.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Welche Schlüssellänge wünschen Sie für den Signatur-Schlüssel? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr ""
"Welche Schlüssellänge wünschen Sie für den Verschlüsselungs-Schlüssel? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr ""
"Welche Schlüssellänge wünschen Sie für den Authentisierungs-Schlüssel? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"Die Karte wird nun rekonfiguriert, um einen Schlüssel von %u Bit zu "
"erzeugen\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "Fehler bem Ändern der Länge des Schlüssels %d auf %u Bit: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
msgid "Note: keys are already stored on the card!\n"
msgstr "Hinweis: Auf der Karte sind bereits Schlüssel gespeichert!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1791,140 -1385,105 +1790,140 @@@ msgstr "
" PIN = '%s' Admin-PIN = '%s'\n"
"Sie sollten sie mittels des Befehls --change-pin ändern\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Signatur-Schlüssel\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Verschlüsselungs-Schlüssel\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Authentisierungs-Schlüssel\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Ungültige Auswahl.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Das KEYTOCARD Kommando schlug fehl: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
msgid "This command is not supported by this card\n"
msgstr "Dieser Befehl wird von dieser Karte nicht unterstützt.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr ""
"Hinweis: Dieses Kommando zerstörrt alle auf der Karte gespeicherten "
"Schlüssel!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
msgid "Continue? (y/N) "
msgstr "Fortsetzen? (j/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Möchten Sie die Karte wirklich komplett löschen? (\"yes\" eingeben) "
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "Menü verlassen"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "Zeige Admin-Befehle"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "Diese Hilfe zeigen"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "Alle vorhandenen Daten auflisten"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "Kartenbesitzernamen ändern"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "Schlüssel-holen-URL ändern"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "Holen des Schlüssels mittels der URL auf der Karte"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "Ändern der Logindaten"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "Ändern der Spracheinstellungen"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "Ändern des Geschlechts des Kartenbesitzers"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "Ändern des CA-Fingerabdrucks"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "neue Schlüssel erzeugen"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "Menü für Ändern oder Entsperren der PIN"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "überprüfe die PIN und liste alle Daten auf"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "die PIN mit dem Rückstellcode wieder freigeben"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr "alle Schlüssel und Daten löschen"
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "nur-Admin Befehl\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Admin-Befehle sind erlaubt\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Admin-Befehle sind nicht erlaubt\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
@@@ -1932,75 -1490,61 +1931,81 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output funktioniert nicht bei diesem Befehl\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "Schlüssel \"%s\" nicht gefunden\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(es sei denn, Sie geben den Schlüssel mittels Fingerprint an)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "dies kann im Batchmodus ohne \"--yes\" nicht durchgeführt werden\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Diesen Schlüssel aus dem Schlüsselbund löschen? (j/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Dies ist ein privater Schlüssel! - Wirklich löschen? (j/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "Fehler beim Löschen des privaten %ss: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "Schlüssel"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "subkey"
msgstr "Unterschlüssel"
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "Der \"Ownertrust\" wurde gelöscht\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr ""
"Es gibt einen privaten Schlüssel zu diesem öffentlichen Schlüssel \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr ""
"Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
"entfernen.\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@@ -2055,7 -1591,6 +2060,7 @@@ msgstr "
"Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
"verletzt die Empfängervoreinstellungen\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, 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"
@@@ -2141,262 -1660,216 +2146,283 @@@ msgstr "
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "WARNUNG: Temporäres Verzeichnis `%s' kann nicht entfernt werden: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "Exportiere auch Signaturen die als nicht exportfähig markiert sind"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "Exportiere Attribute von User-IDs (i.A. Foto-IDs)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "Exportiere Widerrufsschlüssel die als \"sensitiv\" markiert sind"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "Unbrauchbare Teile des Schlüssel während des Exports entfernen"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "Während des Exports soviel wie möglich vom Schlüssel entfernen"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "Schlüssel %s: Schlüsselmaterial ist auf einer Karte - übersprungen\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
msgid " - skipped"
msgstr " - übersprungen"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[User-ID nicht gefunden]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "`%s' automatisch via %s geholt\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "Fehler beim automatischen holen von `%s' über `%s': %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "Kein Fingerabdruck vorhanden"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "(Prüfe das Argument der Option '%s')\n"
+
++#: g10/getkey.c:1216
+ #, c-format
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "\"%s\" wird als voreingestellter geheimer Schlüssel benutzt\n"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "Eine Signatur erzeugen"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "Eine Klartextsignatur erzeugen"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "Eine abgetrennte Signatur erzeugen"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "Daten verschlüsseln"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschlüsseln"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "Daten entschlüsseln (Voreinstellung)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "Signatur prüfen"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "Liste der Schlüssel"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "Liste der Schlüssel und ihrer Signaturen"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "Signaturen der Schlüssel auflisten und prüfen"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "Liste der geheimen Schlüssel"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "Ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
msgid "quickly generate a new key pair"
msgstr "Schnell ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
msgid "quickly add a new user-id"
msgstr "Schnell eine neue User-ID anfügen"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
msgid "quickly sign a key"
msgstr "Schlüssel schnell signieren"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
msgid "quickly sign a key locally"
msgstr "Schlüssel schnell nur für diesen Rechner signieren"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "Schlüssel signieren"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "Schlüssel nur für diesen Rechner signieren"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "Signieren oder bearbeiten eines Schlüssels"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "Die Passphrase ändern"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "Schlüssel exportieren"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "Schlüssel zu einem Schlü.server exportieren"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "Schlüssel von einem Schlü.server importieren"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "Schlüssel auf einem Schlü.server suchen"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "alle Schlüssel per Schlü.server aktualisieren"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "Schlüssel importieren/kombinieren"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "den Karten-Status ausgeben"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "Daten auf einer Karte ändern"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "PIN einer Karte ändern"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "Ändern der \"Trust\"-Datenbank"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "Hashwerte für die Dateien ausgeben"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "Im Server Modus ausführen"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+ "|WERT|Setze die TOFU-Politik für einen Schlüssel (good, unknown, bad, ask, "
+ "auto)"
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-Hülle versehen"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|Verschlüsseln für USER-ID"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|DATEI|Ausgabe auf DATEI schreiben"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "vor Überschreiben nachfragen"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "OpenPGP-Verhalten strikt beachten"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2405,7 -1878,6 +2431,7 @@@ msgstr "
"(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
"Optionen)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2425,11 -1897,9 +2451,11 @@@ msgstr "
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2439,7 -1909,6 +2465,7 @@@ msgstr "
"Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
"Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2447,74 -1916,59 +2473,74 @@@ msgstr "
"\n"
"Unterstützte Verfahren:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Öff. Schlüssel: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Verschlü.: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Komprimierung: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "Aufruf: %s [Optionen] %s\n"
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2522,20 -1976,17 +2548,20 @@@ msgstr "
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2543,488 -1994,434 +2569,555 @@@ msgstr "
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
msgid "show key usage information during key listings"
msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "Richtlinien-URL mit den Signaturen anlisten"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "Alle Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "Standard Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "Benutzer-Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ msgid "available TOFU policies:\n"
+ msgstr "Vorhandene TOFU Regeln:\n"
+
++#: g10/gpg.c:1998
+ #, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "Unbekannte TOFU Regel '%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
+
++#: g10/gpg.c:2022
+ #, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "Unbekanntes TOFU DB Format '%s'\n"
+
++#: g10/gpg.c:2085
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
- #: g10/gpg.c:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+ "WARNUNG: Der Wert '%s' der Option '%s' sollte eine lange Schlüssel-ID\n"
+ "oder ein Fingerabdruck sein\n"
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "Schlüsselangabe '%s' ist mehrdeutig\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr "'%s' paßt mindest auf:\n"
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, c-format
+ msgid "error searching the keyring: %s\n"
+ msgstr "Fehler beim Suchen im Schlüsselbund: %s\n"
+
++#: g10/gpg.c:2423
#, 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:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "Ungültiger Subjekt-Name '%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "`%s' ist kein gültiger Zeichensatz\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "Ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ungültige Import-Option\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "Ungültige Import-Option\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ungültige Export-Option.\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "Ungültige Export-Option\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ungültige Listen-Option.\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "Ungültige Listen-Option\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "Foto-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "Alle Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
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:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
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:2931
++#: g10/gpg.c:3290
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:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
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:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "Ungültige Überprüfungs-Option\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, 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:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed müssen größer als 0 sein\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed müssen größer als 1 sein\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "ungültige Standard-Voreinstellungen\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "ungültige private Hashvoreinstellungen\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "ungültige private Komprimierungsvoreinstellungen\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "Option '%s' ohne gültige Standardschlüssel angegeben\n"
+
++#: g10/gpg.c:4050
+ #, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "Option '%s' ohne Verwendung der Option '%s' angegeben\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [Dateiname]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [Dateiname]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
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:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [Dateiname]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
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:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd User-ID"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "Schlüsselexport fehlgeschlagen: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "Ungültiges Hashverfahren '%s'\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
+
++#: g10/gpg.c:4807
+ #, 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:4854
msgid "[filename]"
msgstr "[Dateiname]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|DATEI|Schlüssel aus der Schlüsselbund DATEI nehmen"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "differierende Zeitangaben sind kein Fehler"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h für Hilfe)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3200,7 -2563,6 +3293,7 @@@ msgstr "
"Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
"ändern\n"
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "Schlüssel %s: Keine User-ID\n"
@@@ -3210,7 -2571,6 +3303,7 @@@
msgid "key %s: %s\n"
msgstr "Schlüssel %s: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr "vom Import-Aufpasser zurückgewiesen"
@@@ -3233,7 -2589,6 +3326,7 @@@ msgstr "Schlüssel %s: Keine gültigen
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
@@@ -3243,262 -2597,226 +3336,278 @@@
msgid "key %s: new key - skipped\n"
msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "Schreiben nach '%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, 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:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
- #: g10/import.c:1562
++#: g10/import.c:1575
#, 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:1663
++#: g10/import.c:1680
#, c-format
msgid "secret key %s: %s\n"
msgstr "Geheimer Schlüssel %s: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
"Schlüssel %s: geheimer Schlüssel mit ungültiger Verschlüsselung %d - "
"übersprungen\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, 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:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
@@@ -3523,61 -2837,52 +3632,66 @@@ msgstr "Die \"Keybox\" `%s' wurde erste
msgid "keyring '%s' created\n"
msgstr "Schlüsselbund `%s' erstellt\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "Schlüsselblockhilfsmittel`%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "Fehler beim Öffnen der Schlüsseldatenbank: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[Widerruf]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[Eigenbeglaubigung]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 falsche Beglaubigung\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d falsche Beglaubigungen\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d Beglaubigungen wegen fehlenden Schlüsseln nicht geprüft\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 Beglaubigung aufgrund von Fehler nicht geprüft\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "Eine User-ID ohne gültige Eigenbeglaubigung entdeckt\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d User-IDs ohne gültige Eigenbeglaubigung entdeckt\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3590,17 -2895,14 +3704,17 @@@ msgstr "
"unterschiedlichen Quellen ...)?\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Ich vertraue ihm marginal\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Ich vertraue ihm vollständig\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3610,47 -2912,40 +3724,52 @@@ msgstr "
"Eine Tiefe größer 1 erlaubt dem zu signierenden Schlüssel\n"
"Trust-Signatures für Sie zu machen.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Geben Sie bitte eine Domain ein, um die Signatur einzuschränken\n"
"oder nur die Eingabetaste für keine Domain\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr "Überspringe User-ID \"%s\" da es keine textbasierte ID ist.\n"
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User-ID \"%s\" ist widerrufen."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Beglaubigen ist nicht möglich.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User-ID \"%s\" ist abgelaufen."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "User-ID \"%s\" ist signierbar."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Wirklich signieren? (j/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3659,11 -2954,9 +3778,11 @@@ msgstr "
"Die Eigenbeglaubigung von \"%s\"\n"
"ist eine PGP 2.x artige Signatur.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung geändert werden? (j/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3672,13 -2965,11 +3791,13 @@@ msgstr "
"Ihre derzeitige Beglaubigung von \"%s\"\n"
"ist abgelaufen.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Soll eine neue Beglaubigung als Ersatz für die abgelaufene erstellt werden? "
"(J/n) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3687,44 -2978,35 +3806,44 @@@ msgstr "
"Die derzeitige Beglaubigung von \"%s\"\n"
"ist nur für diesen Rechner gültig.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schlüssel %s lokal beglaubigt\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schlüssel %s beglaubigt\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Dieser Schlüssel ist verfallen!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Dieser Schlüssel wird %s verfallen.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3734,32 -3016,26 +3853,32 @@@ msgstr "
"wollen, wirklich der o.g. Person gehört?\n"
"Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ich antworte nicht.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ich habe es überhaupt nicht überprüft.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ich habe es flüchtig überprüft.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ich habe es sehr sorgfältig überprüft.%s\n"
# translated by wk
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
msgid "Your selection? (enter '?' for more information): "
msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3768,231 -3044,176 +3887,231 @@@ msgstr "
"Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
"Schlüssel \"%s\" (%s) beglaubigen wollen\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"WARNUNG: Die Signatur wird nicht als nicht-exportierbar markiert werden.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "WARNUNG: Die Signatur wird nicht als unwiderrufbar markiert werden.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "Die Signatur wird als nicht-exportfähig markiert werden.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "Die Signatur wird als unwiderrufbar markiert werden.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "Ich habe diesen Schlüssel flüchtig überprüft.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Wirklich signieren? (j/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
"keine Passphrase ist zu ändern.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "Schlüssel %s: Fehler beim Ändern der Passphrase: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "speichern und Menü verlassen"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "Fingerabdruck des Schlüssels anzeigen"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
msgid "show the keygrip"
msgstr "\"Keygrip\" des Schlüssels anzeigen"
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "Schlüssel und User-IDs auflisten"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "User-ID N auswählen"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "Unterschlüssel N auswählen"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "Signaturen prüfen"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr "die ausgewählten User-IDs beglaubigen [* für verwandte Befehle s.u.]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "Die ausgewählte User-ID nur für diesen Rechner beglaubigen"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "Die ausgewählte User-ID mit einer \"Trust\"-Signatur beglaubigen"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "die ausgewählten User-IDs unwiderrufbar beglaubigen"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "Eine User-ID hinzufügen"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "Eine Foto-ID hinzufügen"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "ausgewählte User-IDs entfernen"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "einen Unterschlüssel hinzufügen"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "der Smartcard einen Schlüssel hinzufügen"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "einen Schlüssel auf die Smartcard schieben"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "eine Sicherungskopie des Schlüssels auf die Smartcard schieben"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "ausgewählte Unterschlüssel entfernen"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "Einen Widerrufschlüssel hinzufügen"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
"das Verfallsdatum des Schlüssel oder ausgewählter Unterschlüssels ändern"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "User-ID als Haupt-User-ID kennzeichnen"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "Liste der Voreinstellungen (für Experten)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "Liste der Voreinstellungen (ausführlich)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "ändern der Voreinstellungsliste der ausgewählten User-IDs"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"Setze die URL des bevorzugten Schlüsselservers für die ausgewählten User-IDs"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "Eine Notation für die ausgewählten User-IDs setzen"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "Die Passphrase ändern"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "Den \"Ownertrust\" ändern"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "Ausgewählte User-ID widerrufen"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "Schlüssel anschalten"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "Schlüssel abschalten"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "ausgewählte Foto-IDs anzeigen"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"unbrauchbare User-IDs verkleinern und unbrauchbare Signaturen aus dem "
"Schlüssel entfernen"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"unbrauchbare User-IDs verkleinern und alle Signaturen aus dem Schlüssel "
"entfernen"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Geheimer Schlüssel ist vorhanden.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4005,251 -3226,193 +4124,250 @@@ msgstr "
"Signaturen\n"
" (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Schlüssel wurde widerrufen."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Wirklich alle textbasierten User-IDs beglaubigen? (j/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Unbekannter Signaturtyp `%s'\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Benutze den '%s' Befehl.)\n"
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? (j/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Diese User-ID wirklich entfernen? (j/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "Befehl benötigt einen Dateinamen als Argument\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Fehler beim Lesen der Sicherungskopie des Schlüssels von `%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? (j/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? (j/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Diese User-ID wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr ""
"Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"\"Owner trust\" kann nicht gesetzt werden, wenn eine anwendereigene 'Trust'-"
"Datenbank benutzt wird\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Setze die Liste der Voreinstellungen auf:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
"(j/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Änderungen speichern? (j/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Beenden ohne zu speichern? (j/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "Änderung fehlgeschlagen: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" ist kein Fingerabdruck\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "No matching user IDs."
msgstr "Keine passende User-ID"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "Nothing to sign.\n"
msgstr "Nichts zu beglaubigen\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Eigenschaften: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Keyserver no-modify"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Bevorzugter Schlüsselserver:"
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "\"Notationen\": "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Der folgende Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr ""
"Dieser Schlüssel könnte durch %s mit Schlüssel %s widerrufen worden sein"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(empfindlich)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "erzeugt: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "widerrufen: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "verfallen: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "verfällt: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "Aufruf: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "Kartennummer:"
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "Vertrauen: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "Gültigkeit: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4257,18 -3420,13 +4375,18 @@@ msgstr "
"Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
"Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "widerrufen"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "verfallen"
# translated by wk
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4276,15 -3434,12 +4394,15 @@@ msgstr "
"WARNUNG: Keine User-ID ist als primär markiert. Dieser Befehl kann\n"
"dazu führen, daß eine andere User-ID als primär angesehen wird.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "WARNUNG: Ihr Unterschlüssel zum Verschlüsseln wird bald verfallen.\n"
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
msgid "You may want to change its expiration date too.\n"
msgstr "Bitte erwägen Sie, dessen Verfallsdatum auch zu ändern.\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4294,78 -3449,61 +4412,78 @@@ msgstr "
"könnte\n"
" bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d Beglaubigungen entfernt.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d Beglaubigungen entfernt.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Nichts entfernt.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "ungültig"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "User-ID \"%s\": %d Signatur entfernt\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "User-ID \"%s\": %d Signaturen entfernt\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "User-ID \"%s\": bereits minimiert\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User-ID \"%s\": bereits sauber\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4375,194 -3513,160 +4493,202 @@@ msgstr "
" Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
" des Schlüssels führen.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
"hinzufügen.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
"eingetragen werden\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
"nicht rückgangig gemacht werden!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
"(j/N): "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Bitte wählen Sie höchstens einen Unterschlüssel aus.\n"
++#: g10/keyedit.c:4014
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Möchten Sie wirklich die Verfallsdaten aller Unterschlüssel ändern? (j/N): "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"Unterschlüssel %s ist des Signieren nicht mächtig und braucht deshalb keine "
"Rücksignatur\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Bitte genau eine User-ID auswählen.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Geben Sie die \"Notation\" ein: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "Fortfahren (j/N)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Keine User-ID mit Hash %s\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "Kein Unterschlüssel mit Index %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "User-ID: \"%s\"\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (nicht-exportierbar)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Diese Signatur ist seit %s verfallen.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "Nicht von Ihnen signiert.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (unwiderrufbar)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "Kein geheimer Schlüssel\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User-ID \"%s\" ist bereits widerrufen\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"WARNUNG: Eine User-ID-Signatur datiert mit %d Sekunden aus der Zukunft\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Schlüssel %s ist bereits widerrufen\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Unterschlüssel %s ist bereits widerrufen\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
@@@ -4601,14 -3697,10 +4727,14 @@@ msgstr "Die Eigenbeglaubigung wird gesc
msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
@@@ -4898,40 -3941,35 +5024,45 @@@ msgstr "
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Ungültiges Zeichen im Namen\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr "Die Zeichen '%s' und '%s' dürfen in einem Namen nicht vorkommen\n"
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Email-Adresse: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Diese Email-Adresse ist ungültig\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Ungültiges Zeichen im Kommentar.\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4942,7 -3980,6 +5073,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
@@@ -4957,31 -3994,24 +5088,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfAa"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (A)bbrechen? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(A)bbrechen? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Ändern: (N)ame, (E)-Mail oder (F)ertig/(A)bbrechen? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -4989,7 -4019,6 +5120,7 @@@ msgstr "
"Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@@ -4997,16 -4026,13 +5128,16 @@@ msgstr "
"Bitte geben Sie die Passphrase ein, um die Sicherheitskopie des neuen "
"Verschlüsselungsschlüssel der Karte zu schützen."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5019,7 -4045,6 +5150,7 @@@ msgstr "
"aufrufen.\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5030,12 -4055,10 +5161,12 @@@ msgstr "
"unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5046,52 -4069,41 +5177,52 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr "Fortsetzen? (J/n) "
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
msgid "Create anyway? (y/N) "
msgstr "Trotzdem erzeugen? (j/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
msgid "creating anyway\n"
msgstr "wird trotzdem erzeugt\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "Hinweis: \"%s %s\" ruft den erweiterten Dialog auf.\n"
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Schlüsselerzeugung abgebrochen.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, c-format
msgid "writing public key to '%s'\n"
msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5100,7 -4112,6 +5231,7 @@@ msgstr "
"werden kann. Sie können aber mit dem Befehl \"--edit-key\" einen\n"
"Unterschlüssel für diesem Zweck erzeugen.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5108,7 -4119,6 +5239,7 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht überein)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5116,236 -4126,184 +5247,236 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht überein)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "Hinweis: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Geheime Teile des Hauptschlüssels sind auf der Karte gespeichert.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Wirklich erzeugen? (j/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "Speicher des Schlüssels auf der Karte schlug fehl: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "niemals "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Entscheidende Beglaubigungsrichtlinie: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Beglaubigungsrichtlinie: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Entscheidender bevorzugter Schlüsselserver"
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Entscheidender Beglaubigungs-\"Notation\": "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Beglaubigungs-\"Notation\": "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
msgid "1 good signature\n"
msgstr "1 korrekte Signatur\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, c-format
msgid "%d good signatures\n"
msgstr "%d korrekte Signaturen\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr "WARNUNG: %lu Schlüssel übersprungen, da sie zu groß sind\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Schlüsselbund"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "übersprungen \"%s\": %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Haupt-Fingerabdruck ="
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr "Unter-Fingerabdruck ="
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Haupt-Fingerabdruck ="
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Unter-Fingerabdruck ="
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Schl.-Fingerabdruck ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " Kartenseriennr. ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, c-format
msgid "caching keyring '%s'\n"
msgstr "Puffern des Schlüsselbundes `%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu Schlüssel bislang gepuffert (%lu Beglaubigungen)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu Schlüssel gepuffert (%lu Beglaubigungen)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: Schlüsselbund erstellt\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr "In Dirmngr gesetzte Proxy Optionen ersetzen"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "Widerrufene Schlüssel in den Suchergebnissen aufführen"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "Unterschlüssel in der Suche über Schlüssel-IDs aufführen"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr "In Dirmngr gesetzte Zeitüberschreitungsoptionen ersetzen"
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "Schlüssel für die Signaturprüfung automatisch holen"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr ""
"Die im Schlüssel enthaltene bevorzugte URL für Schlüsselserver beachten"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "Die im Schlüssel enthaltenen PKA-Daten beim Schlüsselholen beachten"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "abgeschaltet"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "ein Schlüssel wird per %s aktualisiert\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d Schlüssel werden per %s aktualisiert\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "fordere Schlüssel %s von %s-Server %s an\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "fordere Schlüssel %s von %s an\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "sende Schlüssel %s auf den %s-Server %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "sende Schlüssel %s auf %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, c-format
msgid "requesting key from '%s'\n"
msgstr "fordere Schlüssel von %s an\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
@@@ -5379,7 -4331,6 +5510,7 @@@ msgstr "Mit öffentlichem Schlüssel ve
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %s, erzeugt %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
@@@ -5428,221 -4370,172 +5559,216 @@@ msgstr "Entschlüsselung erfolgreich\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "WARNUNG: Verschlüsselte Botschaft ist manipuliert worden!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "Passphrase aus dem Cache gelöscht. Cache ID: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "Entschlüsselung fehlgeschlagen: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Ursprünglicher Dateiname='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"Einzelner Widerruf - verwenden Sie \"gpg --import\", um ihn anzuwenden\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "Keine Signatur gefunden\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FALSCHE Signatur von \"%s\""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Verfallene Signatur von \"%s\""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekte Signatur von \"%s\""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "Signaturüberprüfung unterdrückt\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur vom %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, 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:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Schlüssel erhältlich bei: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[ungewiß] "
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Diese Signatur ist seit %s verfallen.\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Diese Signatur verfällt am %s.\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s Signatur, Hashmethode %s%s%s\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "Binäre"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "Textmodus"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "unbekannt"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
msgid ", key algorithm "
msgstr ", Schlüsselverfahren "
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, 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:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Signatur kann nicht geprüft werden: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "keine abgetrennte Signatur\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "Einzelne Signatur der Klasse 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "Signatur nach alter (PGP 2.x) Art\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "fstat von `%s' schlug fehl in %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) schlug fehl in %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "WARNUNG: Verwendung des experimentellen Public-Key-Verfahrens %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"WARNUNG: Die Verwendung von Elgamal sign+encrypt Schlüsseln ist nicht "
"ratsam\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "WARNING: Verwendung des experimentellen Verschlüsselungsverfahren %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Hinweis: %s basierte Signaturen werden zurückgewiesen.\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: mißbilligte Option \"%s\".\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
"WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
"%s:%u: Die Option \"%s\" is veraltet - sie hat eine Wirkung nur in %s.\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5650,37 -4543,34 +5776,42 @@@ msgstr "
"WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat eine Wirkung nur\n"
"in %s.\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "nicht komprimiert"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "unkomprimiert|kein|keine"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "Mehrdeutige Option '%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, c-format
msgid "unknown option '%s'\n"
msgstr "Unbekannte Option '%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"Der öffentliche ECDSA Schlüssel muß ein Vielfaches von 8 Bit als Länge "
"haben\n"
++#: g10/misc.c:1708
+ #, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Unbekanntes schwache Hashverfahren '%s'\n"
+
+#: g10/openfile.c:85
#, c-format
msgid "File '%s' exists. "
msgstr "Datei '%s' existiert bereits. "
@@@ -5883,31 -4740,24 +6014,31 @@@ msgstr "Ist dieses Bild richtig? (j/N)
msgid "unable to display photo ID!\n"
msgstr "Die Foto-ID kann nicht angezeigt werden!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Kein Grund angegeben"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Schlüssel ist überholt"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Schlüssel wird nicht mehr benutzt"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "User-ID ist nicht mehr gültig"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "Grund für Widerruf: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "Widerruf-Bemerkung: "
@@@ -5921,97 -4771,78 +6052,97 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Es ist kein \"trust value\" zugewiesen für:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"Wie sicher sind Sie, daß dieser Schlüssel wirklich dem angegebenen Besitzer "
"gehört?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Weiß nicht so recht\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Nein, ihm traue ich NICHT\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Ich vertraue ihm absolut\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = Zurück zum Menü\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = diesen Schlüssel überspringen\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " q = verlassen\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr "Die minimale Trust-Ebene für diesen Schlüssel beträgt: %s\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Ihre Auswahl? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Wollen Sie diesem Schlüssel wirklich ultimativ vertrauen? (j/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Zertifikate führen zu einem letztlich vertrauenswürdigen Schlüssel:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: Es gibt keine Garantie, daß dieser Schlüssel wirklich dem angegebenen "
"Besitzer gehört.\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: Es gibt nur eine beschränkte Garantie, daß dieser Schlüssel wirklich dem "
"angegebenen Besitzer gehört.\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Dieser Schlüssel gehört wahrscheinlich dem angegebenen Besitzer\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr ""
"Dieser Schlüssel gehört uns (da wir nämlich den geheimen Schlüssel dazu "
"haben)\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6021,120 -4852,95 +6152,120 @@@ msgstr "
"Genannten gehört. Wenn Sie *wirklich* wissen, was Sie tun,\n"
"können Sie die nächste Frage mit ja beantworten\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "Diesen Schlüssel trotzdem benutzen? (j/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
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:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Hinweis: Dieser Schlüssel wurde abgeschaltet.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Hinweis: Überprüfte Adresse des Unterzeichners ist `%s'\n"
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, 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:600
++#: g10/pkclist.c:601
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:608
++#: g10/pkclist.c:609
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:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: übersprungen: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Derzeitige Empfänger:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6142,75 -4948,58 +6273,75 @@@ msgstr "
"\n"
"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Keine solche User-ID vorhanden.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "Keine gültigen Adressaten\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, 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:1566
++#: g10/pkclist.c:1568
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, c-format
msgid "error creating '%s': %s\n"
msgstr "Fehler beim Erstellen von `%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Abgetrennte Beglaubigungen.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Bitte geben Sie den Namen der Datendatei ein: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "lese stdin ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "keine signierten Daten\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "kann signierte Datei '%s' nicht öffnen.\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
@@@ -6249,8 -5031,6 +6380,8 @@@ msgstr "Hinweis: geheimer Schlüssel %
msgid "Note: key has been revoked"
msgstr "Hinweis: Schlüssel wurde widerrufen"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "\"build_packet\" fehlgeschlagen: %s\n"
@@@ -6260,42 -5039,36 +6391,46 @@@
msgid "key %s has no user IDs\n"
msgstr "Schlüssel %s hat keine User-IDs\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Schlüssel soll widerrufen werden von:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Dies ist ein \"sensitiver\" Widerrufsschlüssel)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ msgid "Secret key is not available.\n"
+ msgstr "Geheimer Schlüssel ist nicht vorhanden.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr ""
"Ein vorgesehenes Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "Ausgabe mit ASCII Hülle erzwungen\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Widerrufzertifikat erzeugt.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "keine Widerrufsschlüssel für \"%s\" gefunden\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Dies ist ein Widerrufszertifikat für den OpenPGP Schlüssel:"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6308,7 -5081,6 +6443,7 @@@ msgstr "
"ein neues Widerrufszertifikat zu erzeugen, um den Grund des Widerrufs\n"
"mit angeben zu können."
- #: g10/revoke.c:564
++#: g10/revoke.c:572
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"
@@@ -6319,12 -5091,21 +6454,25 @@@ msgstr "
"unten eingefügt. Vor dem Import dieses Widerrufszertifikats\n"
"entfernen Sie bitte dieses Doppelpunkt mittels eines Texteditors."
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "Geheimer Schlüssel \"%s\" nicht gefunden\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:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr "'%s' trifft auf mehrere geheime Schlüssel zu:\n"
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
# translated by wk
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6344,34 -5125,27 +6492,34 @@@ msgstr "
"Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n"
"machen.\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Grund für den Widerruf:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Abbruch"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Grund für Widerruf: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Keine Beschreibung angegeben)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Ist das OK? (j/N) "
@@@ -6397,36 -5167,29 +6545,36 @@@ msgid "%s key %s requires a %zu bit or
msgstr ""
"%s-Schlüssel %s benötigt einen mindestens %zu Bit langen Hash (Hash ist %s)\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "WARNUNG: Signaturunterschlüssel %s hat keine Rücksignatur\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "Siehe %s für weitere Infos\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "WARNUNG: Signaturunterschlüssel %s hat eine ungültige Rücksignatur\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Signatur\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Signatur\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6434,7 -5197,6 +6582,7 @@@ msgstr "
"Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhrenproblem)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6442,31 -5204,26 +6590,31 @@@ msgstr "
"Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhrenproblem)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Hinweis: Signaturschlüssel %s wurde widerrufen\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"Vermutlich eine FALSCHE Signatur von Schlüssel %s, wegen unbekanntem "
"\"critical bit\"\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselwiderruf-"
"Beglaubigung\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
@@@ -6514,33 -5265,27 +6662,33 @@@ msgstr "
msgid "signing:"
msgstr "signiere:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s Verschlüsselung wird verwendet\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
"echten Zufallsgenerator verwendbar\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "übersprungen \"%s\": doppelt\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
"NICHT sicher genug!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
@@@ -6585,7 -5322,6 +6733,7 @@@ msgstr "Fehler beim Suchen des \"Trust
msgid "read error in '%s': %s\n"
msgstr "Lesefehler in `%s': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
@@@ -6614,7 -5345,6 +6762,7 @@@ msgstr "trustdb Satz %lu: write fehlges
msgid "trustdb transaction too large\n"
msgstr "trustdb Transaktion zu groß\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "kann auf `%s' nicht zugreifen: %s\n"
@@@ -6728,118 -5435,95 +6876,118 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s' ist keine gültige lange Schlüssel-ID\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "Schlüssel %s: Als vertrauenswürdiger Schlüssel akzeptiert\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "Schlüssel %s tritt mehr als einmal in der \"trustdb\" auf\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"Schlüssel %s: kein öffentlicher Schlüssel für den vertrauenswürdigen "
"Schlüssel - übersprungen\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "Schlüssel %s ist als ultimativ vertrauenswürdig gekennzeichnet\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, 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:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
"Sie können versuchen die Vertrauensdatenbank durch folgende Befehle\n"
"wiederherzustellen:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "Falls dies nicht funktioniert, sehen Sie bitte im Handbuch nach\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"kann unbekanntes Vertrauensmodell nicht verwenden (%d) - verwende "
"Vertrauensmodell %s\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "verwende Vertrauensmodell %s\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "\"Trust-DB\"-Überprüfung ist beim `%s'-Vertrauensmodell nicht nötig\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "\"Trust-DB\"-Änderung ist beim `%s'-Vertrauensmodell nicht nötig\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "Bitte ein --check-trustdb durchführen\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "\"Trust-DB\" wird überprüft\n"
# translated by wk
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "öff. Schlüssel des ultimativ vertrauten Schlüssel %s nicht gefunden\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "%d marginal-needed, %d complete-needed, %s Vertrauensmodell\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -6847,7 -5531,6 +6995,7 @@@ msgstr "
"Tiefe: %d gültig: %3d signiert: %3d Vertrauen: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7090,11 -5724,9 +7238,11 @@@ msgstr "PIN für CHV%d ist zu kurz; di
msgid "verify CHV%d failed: %s\n"
msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "Karte ist dauerhaft gesperrt!\n"
@@@ -7223,14 -5827,12 +7371,14 @@@ msgstr "Die Hashmethode %s wird von de
msgid "signatures created so far: %lu\n"
msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
"worden\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@@ -7250,7 -5849,6 +7398,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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NAME|Die Debugstufe auf NAME setzen"
@@@ -7308,12 -5894,10 +7456,12 @@@ msgstr "
"Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
"auszuführen\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "Handhabungsroutine für fd %d gestartet\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "Handhabungsroutine für den fd %d beendet\n"
@@@ -7742,7 -6234,6 +7890,7 @@@ msgstr "Zeile %d: Fehler beim Holen de
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "Zeile %d: Schlüsselerzeugung schlug fehl: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8330,7 -6701,6 +8478,7 @@@ msgstr " dauerhaft geladene Zertifika
msgid " runtime cached certificates: %u\n"
msgstr "zur Laufzeit zwischengespeicherte Zertifikate: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
msgid "certificate already cached\n"
msgstr "Zertifikat ist bereits im Zwischenspeicher\n"
@@@ -8338,8 -6707,6 +8486,8 @@@
msgid "certificate cached\n"
msgstr "Zertifikat wurde zwischengespeichert\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, c-format
msgid "error caching certificate: %s\n"
msgstr "Fehler beim Zwischenspeichern des Zertifikats: %s\n"
@@@ -8398,7 -6754,6 +8546,7 @@@ msgstr "Die Zwischenspeicherdatei `%s'
msgid "not removing file '%s'\n"
msgstr "Die Datei `%s' wird nicht gelöscht\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, c-format
msgid "error closing cache file: %s\n"
msgstr "Fehler beim Schließen der Zwischenspeicherdatei: %s\n"
@@@ -8637,155 -6948,125 +8785,155 @@@ 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:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "Ungültige Hashmethode `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr "gcry_md_open für Methode %d fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr "Ungültige S-Expression von Libksba erhalten\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, c-format
msgid "converting S-expression failed: %s\n"
msgstr "Konvertierung der S-Expression fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "Erzeugen der S-Expression fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, c-format
msgid "ksba_crl_parse failed: %s\n"
msgstr "ksba_crl_parse fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "Die \"Update Times\" konnte nicht aus der CRL bestimmt werden: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr "Die \"Update Times\" dieser CRL sind: this=%s next=%s\n"
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr "\"nextUpdate\" fehlt; wir nehmen eine Gültigkeit von einem Tag an\n"
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, c-format
msgid "error getting CRL item: %s\n"
msgstr "Fehler beim Holen eines CRL Items: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr ""
"Fehler beim Einfügen eines Items in die temporäre Zwischenspeicherdatei: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "In der CRL wurde kein CRL Herausgeber gefunden: %s\n"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
"CRL Herausgeberzertifikat wird über \"authorityKeyIdentifier\" geholt\n"
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, c-format
msgid "CRL signature verification failed: %s\n"
msgstr "Signaturprüfung der CRL ist fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "Fehler beim Püfen des CRL Herausgeberzertifikats: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "ksba_crl_new fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "ksba_crl_set_reader fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "Die alte temporäre Zwischenspeicherdatei `%s' wurde entfernt\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr ""
"Problem beim Löschen der alten temporären Zwischenspeicherdatei `%s': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "Fehler beim Erzeugen der temporären Zwischenspeicherdatei `%s': %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, c-format
msgid "crl_parse_insert failed: %s\n"
msgstr "crl_parse_insert fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr ""
"Fehler beim Fertigstellen der temporären Zwischenspeicherdatei `%s': %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "Fehler beim Schließen der temporären Zwischenspeicherdatei `%s': %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
"WARNUNG: Neue CRL ist immer noch zu alt; sie verfiel am %s - wird trotzdem "
"geladen\n"
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr "Neue CRL ist immer noch zu alt; sie verviel am %s\n"
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr "Unbekannte kritische CRL Erweiterung %s\n"
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "Fehler beim Lesen einer CRL Erweiterung: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, c-format
msgid "creating cache file '%s'\n"
msgstr "Zwischenspeicherdatei `%s' wird erzeugt\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "Problem beim Umbenennen von `%s' nach `%s': %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
@@@ -8793,69 -7074,56 +8941,69 @@@ msgstr "
"Update der Zwischenspeicherverzeichnisdatei fehlgeschlagen - "
"Zwischenspeichereintrag wird mit dem nächste Programmstart verloren gehen\n"
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr "Anfang CRL Ausgabe (geholt via %s)\n"
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
" FEHLER: Die CRL wird nicht benutzt, da sie trotz eines Updates zu alt war!\n"
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
" FEHLER: Die CRL wird nicht benutzt, da sie eine unbekannte kritische CRL "
"Erweiterung trägt!\n"
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr " FEHLER: Die CRL wird nicht benutzt\n"
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
" FEHLER: Diese zwischengespeicherte CRL ist möglicherweise abgeändert "
"worden!\n"
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
msgid " WARNING: invalid cache record length\n"
msgstr " WARNUNG: Ungültige Länge eines Zwischenspeicherdatensatzes\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, c-format
msgid "problem reading cache record: %s\n"
msgstr "Problem beim Lesen eines Zwischenspeicherdatensatzes: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, c-format
msgid "problem reading cache key: %s\n"
msgstr "Problem beim Lesen eines Zwischenspeicherschlüssels: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "Fehler beim Lesen eine Zwischenspeichereintrags aus der DB: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr "Ende CRL Ausgabe\n"
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "crl_fetch über den DP fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "crl_cache_insert über den DP fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "crl_cache_insert über den Issuer fehlgeschlagen: %s\n"
@@@ -8899,66 -7157,50 +9047,66 @@@ msgstr "Fehler beim Holen von `%s': %s\
msgid "error retrieving '%s': http status %u\n"
msgstr "Fehler beim Holen von `%s': HTTP Status %u\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
- msgid "CRL access not possible due to TOR mode\n"
- msgstr "CRL Zugriff ist im TOR Modus nicht möglich\n"
+ msgid "CRL access not possible due to Tor mode\n"
+ msgstr "CRL Zugriff ist im Tor Modus nicht möglich\n"
+#: dirmngr/crlfetch.c:386
#, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "Zertifikatsuche ist nicht möglich da %s abgeschaltet ist\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr "OCSP anstatt CRL benutzen"
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr "Teste ob der dirmngr noch läuft"
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
msgid "add a certificate to the cache"
msgstr "Ein Zertifikat dem Zwischenspeicher zufügen"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
msgid "validate a certificate"
msgstr "Zertifikat prüfen"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
msgid "lookup a certificate"
msgstr "Zertifikat auffinden"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
msgid "lookup only locally stored certificates"
msgstr "Nur lokal gespeicherte Zertifikate auffinden"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr "Eine URL wird für --lookup erwartet"
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr "CRL in den Dirmngr laden"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr "Sondermodus für Squid"
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
msgid "expect certificates in PEM format"
msgstr "Zertifikate werden im PEM Format erwartet"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
msgstr "Die Nutzung des voreingestellten OCSP Responder erzwingen"
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
"Gebrauch: dirmngr-client [Optionen] [Zertdatei|Muster] (-h für Hilfe)\n"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -8971,214 -7213,143 +9119,187 @@@ msgstr "
"The Prozess gibt 0 zurück wenn das Zertifikat gültig ist, 1 wenn es nicht\n"
"gültig ist und weitere Werte bei anderen Fehlern.\n"
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "Fehler beim Lesen des Zertifikats von der Standardeingabe: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "Fehler beim Lesen des Zertifikats von `%s': %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr "Zertifikat ist zu groß um Sinnvoll zu sein\n"
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, c-format
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "Verbindung zum Dirmngr nicht möglich: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, c-format
msgid "lookup failed: %s\n"
msgstr "Aufsuchen fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "Laden der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr "Ein dirmngr ist vorhanden und aktiv\n"
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "Prüfung des Zertifikats fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
msgid "certificate is valid\n"
msgstr "Zertifikat ist gültig\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
msgid "certificate has been revoked\n"
msgstr "Zertifikat wurde widerrufen\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, c-format
msgid "certificate check failed: %s\n"
msgstr "Zertifikatprüfung fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr "Erhielt Status: `%s'\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "Fehler beim Schreiben der Base-64 Darstellung: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr "Offensichtlich ist kein Dirmngr vorhanden\n"
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr "Dirmngr läuft nicht - ein neuer wird gestartet\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr "Fehlerhafte %s Variable\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "Dirmngr Protocol Version %d wird nicht unterstützt\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "Verbindung zum Dirmngr nicht möglich - Rückfallmethode wird versucht\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "Verbindung zum Dirmngr nicht möglich: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "Nicht unterstützte INQUIRY `%s'\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr "Absoluter Dateiname erwartet\n"
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr "Auffinden von `%s'\n"
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr "Als Windows-Service ausführen (Hintergrund)"
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|Hole eine CRL von dieser URL"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr "Den Dirmngr herunterfahren"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr "Den Zwischenspeicher löschen"
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
msgid "run without asking a user"
msgstr "Ausführung ohne Benutzernachfrage"
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr "Laden von abgelaufenen CRLs erzwingen"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr "OCSP Anfragen erlauben"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr "Sperre die Benutzung von HTTP"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr "Sperre die Benutzung von LDAP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr "Übergehe HTTP CRL Distribution Points"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr "Übergehe LDAP CRL Distribution Points"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|Leite alle HTTP Anfragen über URL"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|Benutze HOST für LDAP Anfragen"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 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:207
++#: dirmngr/dirmngr.c:209
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
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:219
++#: dirmngr/dirmngr.c:222
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:221
- msgid "route all network traffic via TOR"
- msgstr "Netzzugriff nur über TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
+ msgstr "Netzzugriff nur über Tor"
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9188,11 -7359,9 +9309,11 @@@ msgstr "
"(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
"und Optionen)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9200,79 -7369,62 +9321,79 @@@ msgstr "
"Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
"Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "Gültige Debugebenen sind: %s\n"
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, c-format
msgid "usage: %s [options] "
msgstr "Aufruf: %s [Optionen] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
msgid "colons are not allowed in the socket name\n"
msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: Lesefehler: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, 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:1794
++#: dirmngr/dirmngr.c:1804
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:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
msgid "shutdown forced\n"
msgstr "Herunterfahren wurde erzwungen\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "Signal %d empfangen - keine Aktion definiert\n"
@@@ -9513,12 -7614,10 +9634,12 @@@ msgstr "`%s:%d' wird der LDAP Serverlis
msgid "malloc failed: %s\n"
msgstr "malloc() fehlgeschlagen: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: Ungültiges Muster `%s'\n"
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search erreichte die Größengrenze des Servers\n"
@@@ -9550,11 -7643,9 +9671,11 @@@ msgstr "Fehler beim Lesen vom Responder
msgid "response from server too large; limit is %d bytes\n"
msgstr "Antwort vom Server zu lang; die Grenze sind %d Bytes\n"
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr "OCSP Anfrage ist im TOR Modus nicht möglich\n"
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "OCSP Anfrage ist im Tor Modus nicht möglich\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr "OCSP Anfrage nicht möglich da HTTP abgeschaltet ist\n"
@@@ -9698,71 -7759,60 +9819,76 @@@ msgstr "OCSP Responder gab einen nicht
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP Responder gab einen zu alten Status zurück\n"
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr "LDAP Server fehlt"
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr "Seriennummer fehlt in der Cert-ID"
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, c-format
msgid "error sending data: %s\n"
msgstr "Fehler beim Senden der Daten: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d überschritten\n"
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
+
++#: dirmngr/server.c:2430
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "Fehler beim Initialisieren des Servers: %s\n"
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept Problem: %s\n"
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@@ -10011,11 -8001,9 +10137,11 @@@ msgstr "Optionen zum Einstellen der Aus
msgid "Options controlling the interactivity and enforcement"
msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
- msgstr "Optionen zur Benutzung von TOR"
+ msgid "Options controlling the use of Tor"
+ msgstr "Optionen zur Benutzung von Tor"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "Konfiguration für HTTP Server"
diff --cc po/el.gmo
index 42be535,0000000..ea4a5a1
mode 100644,000000..100644
Binary files differ
diff --cc po/el.po
index 1f4893a,6c79f4c..5bcaa34
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <madf at hellug.gr>\n"
"Language-Team: Greek <nls at tux.hellug.gr>\n"
@@@ -69,7 -58,6 +69,7 @@@ msgstr "�� ������ ����� ������
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -79,75 -67,59 +79,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "���� ����� ������"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "� ������ ����� ���� ������\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "� ����� ������ ����� ���� ������\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "�� ������� ���������� ��� �����\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "���� MPI"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "���� ����� ������"
@@@ -157,25 -128,11 +157,25 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "��� ������������� � ���������� ���������� %d%s\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -248,11 -192,9 +248,11 @@@ msgstr "�������������� �� ����� ������
msgid "failed to create stream from socket: %s\n"
msgstr "%s: �������� ����������� hashtable: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -395,42 -311,28 +395,42 @@@ msgstr "
"��������:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "���������"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "����� ������"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -515,11 -400,6 +515,11 @@@ msgstr "��� �������������
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -535,145 -413,107 +535,144 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "������ �������� `%s': %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "�������� �������� ��� `%s'\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "�������� ����������� ��� %s: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
- #: agent/gpg-agent.c:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: ��������� �������������\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read ������� (n=%d): %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: �������� ����������� ���������: %s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "� ��������� �������� �������: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ������������: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
@@@ -689,8 -527,6 +688,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -698,9 -534,6 +697,9 @@@ msgstr "
"@�������:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -754,7 -579,6 +753,7 @@@ msgstr "�������
msgid "error while asking for the passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@@ -937,8 -727,6 +936,8 @@@ msgstr "������ ��� ���������� ��� �����
msgid "error creating a stream for a pipe: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@@ -1091,7 -847,6 +1090,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1110,7 -862,6 +1109,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1404,7 -1095,6 +1403,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "�� �������������"
@@@ -1588,19 -1240,14 +1587,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "�������������� �� ����� ������: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "�� ������� ������ ��� ����� ���������"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
@@@ -1615,222 -1260,171 +1614,222 @@@ msgstr "���� � ������ ����������� �� ��
msgid "Reset Code not or not anymore available\n"
msgstr "������� ��� �������� �������� ��� ����� ���������\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "� ������� ���; "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "��� ���� ������� �����"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "�� �������������"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "������ ��������� ������� ������: %s\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "����������� ��������"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "������: �� ������ ���������\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "���������� ��� fingerprint"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "������: �� ������ ���������\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "� ���������� �������� �������: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "�� �������� ������ OpenPGP ��������.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "�� ������� �������� �� ������; (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "�� ������� �������� �� ������; (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "�� ������� �������� �� ������; (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "����������������� ��� �� %u bits\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1838,155 -1432,120 +1837,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (��� ������������� ����)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "�� ������ �������.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "������� �� ���������; "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "����������� ����� ��� �����"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "������������� �������\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "���������� ����� ��� ��������"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "������ ��������� ���: "
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "������ ��� ����������� �����"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "������ ��� ������������ ���������"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "���������� ��� fingerprint"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "������������� �������\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "������������� �������\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "�� ������ ������ (��������� \"help\")\n"
@@@ -1994,79 -1552,65 +1993,85 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output ��� ���������� ��� ���� ��� ������\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "�� ������ '%s' �� �������: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(����� ��� ������������� ��� ������ ��� ���������)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "��� ������ �� ����� ���� �� ��������� ������ ����� �� \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "�������� ����� ��� �������� ��� �� ����������; "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "���� ����� ��� ������� ������! - ������� �� ���������; "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "key"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "�����������:"
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "���������� ����������� ������������-���������\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "������� ��� ������� ������ ��� �� ������� ������ \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr ""
"��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@@ -2122,7 -1658,6 +2127,7 @@@ msgstr "
"� ������������ ����������� ���������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
@@@ -2210,7 -1729,6 +2215,7 @@@ msgstr "�������������: �������� �������
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
@@@ -2218,283 -1736,237 +2223,303 @@@
"� �������� �� ��������� ��� ��-�����������.\n"
"\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "�� ��������������� ������� ������"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "������ %08lX: ������ ����� PGP 2.x - ������������\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr ""
"������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ������������: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "�������������: ��� ����� ������ �������\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[User id ��� �������]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "���������� ��� fingerprint"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "�� ������� ������ `%s' �� �������: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "�� ������� �������� ���������\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|�����|����� �������� ��� �������������� ������� ������"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "���������� ���� �� ������������� ���������"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[������]|���������� ���� �� ���������������� ���������"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "���������� ���� �� ������������� ���������"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "������������� ���������"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "������������� �� ����� ���� ����������� ����������"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "���������������� ��������� (��������������)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "���������� ���� ���������"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "���������� ��� ������ ��������"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "���������� ��� ������ �������� ��� ���������"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "������� ��������� ��������"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "���������� ��� ������ �������� ��������"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "���������� ���� �������������� ���������"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "�������� ���� ��������"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "�������� ���� �������� ������"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "�������� ���� ��������"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "�������� ���� �������� ������"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "�������� � ����������� ���� ��������"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "������ ��� ������ ������"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "������� ��������"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "������� �������� �� ��� ���������� ��������"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "�������� �������� ��� ��� ���������� ��������"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "��������� �������� �� ��� ���������� ��������"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "��������/���������� ��������"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "�������� ��� ����� ��������� ������������"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|����� [������]| ���������� ���������� ��� ���������"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "���������� ascii ������������ ������"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|�����|������������� ��� �����"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|���������� �������� ��������� N (0 �������������)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "����� ��������� ���������� ��������"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "�� �� ����� ������ ������"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "������� ���� ��� ���������"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2502,7 -1974,6 +2527,7 @@@ msgstr "
"@\n"
"(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2522,13 -1993,11 +2547,13 @@@ msgstr "
" --list-keys [�������] ���������� ��������\n"
" --fingerprint [�������] ���������� ������������ (fingerprints)\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2543,7 -2012,6 +2568,7 @@@ msgstr "
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2551,595 -2019,521 +2576,660 @@@ msgstr "
"\n"
"��������������� ����������:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "�����������:"
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "���������������: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "��������: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "�����: gpg [��������] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "������������� �������\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "������� ����������� ��������� \"%s\"\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "������������� ��� ������"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "�������� ��������������� ���������� `%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "�������� ��������������� ���������� `%s'\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�������� ������� ��� exec-path �� %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"� ����������� ���������� ��������� ��� �����������\n"
"��� ����� �������\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "�� ������� �����������\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "�� ������� ����������� ���������� ���������������\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3497
++#: g10/gpg.c:3868
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3502
++#: g10/gpg.c:3873
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"�������������: ������� ���������� (-r) ����� ����� ��������������\n"
"�������� ��������\n"
- #: g10/gpg.c:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "�� ������� ���������� hash `%s'\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "�� ������� ���������� hash `%s'\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [����� �������]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [����� �������]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "���������������� �������: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [����� �������]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [����� �������]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [����� �������]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [����� �������]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [����� �������]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [�������]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver ���� �������: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "������� �������� �������: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver ��������� �������: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "����������� �������: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�������� �������: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[����� �������]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "������� ��� �������� ��� ���� �� ����������"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|������� ��� ����������� ���������� ��� FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3315,7 -2675,6 +3405,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
@@@ -3325,7 -2683,6 +3415,7 @@@
msgid "key %s: %s\n"
msgstr "������������ `%s': %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3348,7 -2701,6 +3438,7 @@@ msgstr "������ %08lX: ��� ���� ������ u
msgid "this may be caused by a missing self-signature\n"
msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
@@@ -3358,266 -2709,229 +3448,281 @@@
msgid "key %s: new key - skipped\n"
msgstr "������ %08lX: ��� ������ - ������������\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "��� ������� ��������� ����������: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "������� ��� `%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
- #: g10/import.c:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
- #: g10/import.c:1194
++#: g10/import.c:1203
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "������ %08lX: \"%s\" ����������\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "������ %08lX: ������� ������ ���������\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/import.c:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "�� ������� ������ `%s' �� �������: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
"���������\n"
- #: g10/import.c:1851
++#: g10/import.c:1893
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"������ %08lX: �� ��������������� ���������� �������� �������� ��� user id "
"\"%s\"\n"
- #: g10/import.c:1979
++#: g10/import.c:2021
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
- #: g10/import.c:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "������ %08lX: ������������ user ID '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "������ %08lX: ������������ ���������\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
- #: g10/import.c:2198
++#: g10/import.c:2240
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
- #: g10/import.c:2216
++#: g10/import.c:2258
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
- #: g10/import.c:2238
++#: g10/import.c:2280
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
- #: g10/import.c:2367
++#: g10/import.c:2409
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� "
"%08lX\n"
- #: g10/import.c:2447
++#: g10/import.c:2489
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
"��� ����� �����.\n"
- #: g10/import.c:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
@@@ -3644,61 -2954,52 +3749,66 @@@ msgstr "���������� `%s' �������������\n
msgid "keyring '%s' created\n"
msgstr "���������� `%s' �������������\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "�������� ������������ ��� cache �����������: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[��������]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[����-��������]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 ���� ��������\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d ����� ���������\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d ��������� ��� ���������� ���� ���������\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 user ID ����������� ����� ������ ����-��������\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d user ID ������������ ����� ������� ����-���������\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3711,63 -3012,53 +3821,68 @@@ msgstr "
"�� �������� passports ��� fingerprints ��� �������� �����...);\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = ��� ������ �����������\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = ��� ����� �����������\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "�� user ID \"%s\" ����������."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "������� ������ ����� �� �� ����������; (y/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " �������� ���������.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "�� user ID \"%s\" ���� �����."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "������� �� ���������; "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3776,11 -3067,9 +3891,11 @@@ msgstr "
"� ����-�������� ��� \"%s\"\n"
"����� ��� �������� ����� PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3789,12 -3078,10 +3904,12 @@@ msgstr "
"� ������������ �������� ��� ��� \"%s\"\n"
"���� �����.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3803,43 -3090,34 +3918,43 @@@ msgstr "
"� ������������ �������� ��� ��� \"%s\"\n"
"����� ��� ������ ��������.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "������� ������ ����� �� �� ��������������; (y/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "������ ��� �� ��������� �� �� ������ %08lX\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "���� �� ������ ���� �����!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "������ � ���������� �� ����� ����������; (Y/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3849,32 -3127,26 +3964,32 @@@ msgstr "
"������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
"�������\"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) ��� ������.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) ��� ��� ������� �������.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ��� ����� ��� ������ ������.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) ��� ����� ���������� ������.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "� ������� ���; (�������������� ? ��� �����������): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3883,21 -3155,18 +3998,21 @@@ msgstr "
"������� ������ �� ���������� ���� �� ������\n"
"�� �� ������ ���: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"���� �� ����� ��� ����-��������.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"�������������: � �������� �� �� ��������� ��� ��-���������.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
@@@ -3905,14 -3174,12 +4020,14 @@@
"�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
"\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"� �������� �� ��������� ��� ��-���������.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
@@@ -3920,237 -3187,187 +4035,237 @@@
"� �������� �� ��������� ��� ��-�����������.\n"
"\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"��� ��� ������� ������� ���� �� ������.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"��� ����� ����������� ������ �� ���� �� ������.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"��� ������� ���� ���������� ���� �� ������.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "������� �� ���������; "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "���������� ��������� �������� ��� ����� ����\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "���������� ��� ������"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "���������� ��� fingerprint"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "�������� ���������: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "���������� ��� �������� ��� ��� user ID"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "������� user ID N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "������� user ID N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "�������� ���������"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "�������� ��� �������� ������"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "��������: �������� �� user ID ��� ��������\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "�������� ���� user ID"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "�������� ���� photo ID"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "�������� ���� user ID"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "�������� ���� ������������� ��������"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "�������� ���� �������� ���������"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "�������� ��� user ID ��� ��������"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "���������� ����������� (�������)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "���������� �������� (���������)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "������ ��� ������ ������"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "������ ��� ������������ ���������"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "�������� ���� user ID"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "�������� ���� ������������� ��������"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "����������� ��� ������"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "������������� ��� ������"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "���������� photo ID"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "�� ������� ������ ����� ���������.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4158,268 -3375,211 +4273,268 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "�� ������ ����������."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "������� �� ���������� ��� �� user ID; "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "������� �� ���������� ��� �� user ID; "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "��������: �������� �� user ID ��� ��������\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "������� ����� ���������"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "������ �� ��������� �� �������� ��� user ID.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "������� ������ �� ��������� ���� �� user ID; "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "������� ������ �� ��������� ���� �� user ID; "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "������ �� ��������� ����������� ��� ������.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "������ �� ��������� ����������� ��� ������.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "������� ������ �� ��������� ���� �� user ID; "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "������� ����������� ��������"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "������� �� ���������� �� �����������;"
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "���������� ��� �������; "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "����������� ����� ����������; "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "�� ������� ������ `%s' �� �������: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "������: �� ������ ���������\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "��� ������� ���� �� user ID.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "������ ��� �� ��������� �� �� ������ %08lX\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "��������: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "����������: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "��������: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (���������)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "�������� ����������� ��� %s: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[����������]"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [�����: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [�����: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " �����������: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " �����������: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "���� �� ������ ���� ���������������"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4427,19 -3587,14 +4542,19 @@@ msgstr "
"� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
"����� ��� ��� �������������� �� ���������.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[����������]"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4447,17 -3602,14 +4562,17 @@@ msgstr "
"�������������: ��� ���� ��������� ID ������ ��� ��������. ���� � ������\n"
" ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4466,79 -3618,62 +4581,79 @@@ msgstr "
"�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
" ������ �� ����� ������� �������� PGP �� �� ����������.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "������� ����� ������ �� �� ����������; (y/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "����������� %d ��������.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "����������� %d ���������.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "������ ��� �����������.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
#, fuzzy
msgid "invalid"
msgstr "�� ������ ��������"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "�� user ID \"%s\" ����������."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "�� user ID \"%s\" ����������."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "�� user ID \"%s\" ����������."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4548,38 -3683,31 +4663,38 @@@ msgstr "
" ������������ �������� ������ �� ����� ������� �������� PGP\n"
" �� �� ����������.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "�������������� �� user ID ��� ����������� ��������: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
"���������!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4587,165 -3715,139 +4702,174 @@@ msgstr "
"����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
"N): "
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
+ "N): "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
"������������\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "������ �� ��������� ������� ��� user ID.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "������� ������ ����� �� �� ���������������; (y/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "������� ������ ����� �� �� ���������������; (y/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "�������� ���������: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "��������� (y/N); "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "��� ������� user ID �� ������ %d\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " ����������� ��� %08lX ���� %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (��-���������)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���� � �������� ����� ���� %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " ����������� ��� %08lX ���� %s%s\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "����� ��������� ���� �� user ID:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (��-���������)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " ���������� ��� %08lX ���� %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "��������� �� ����������� ����� ��� ���������:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "������ ������� ������\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
@@@ -4787,14 -3881,10 +4911,14 @@@ msgstr "������� ����-���������\n
msgid "writing key binding signature\n"
msgstr "������� ��������� \"�������\" ��������\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "�� ������ ������� ��������, ����� %u bits\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "��������������� ��� ������� �������� ��� %u bits\n"
@@@ -5092,41 -4133,36 +5216,46 @@@ msgstr "
msgid "Real name: "
msgstr "������� �����: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "�� ������� ���������� ��� �����\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "��������� Email: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "�� ������ ��������� Email\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "������: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "�� ������� ���������� ��� ������\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "�������������� �� `%s' ��� ����������.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5137,7 -4173,6 +5266,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
@@@ -5152,35 -4187,28 +5281,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "��������, ��������� ����� �� ������\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5188,23 -4216,19 +5317,23 @@@ msgstr "
"���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5216,7 -4240,6 +5345,7 @@@ msgstr "
"����� ������, �� ��� ������� \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5228,12 -4251,10 +5357,12 @@@ msgstr "
"���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
"��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "� ���������� �������� �������: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5241,56 -4262,45 +5370,56 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' ��� �����������\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "����� ���������� ����� ��� ��������; "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
msgid "creating anyway\n"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "� ���������� �������� ����������.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "�� ������� ��������� ������� ����������: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5301,7 -4311,6 +5430,7 @@@ msgstr "
"�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
"��� ���������� ������ ��� ���� �� ����.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5309,7 -4318,6 +5438,7 @@@ msgstr "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5317,7 -4325,6 +5446,7 @@@ msgstr "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
@@@ -5325,242 -4332,191 +5454,242 @@@ msgstr "
"��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
"�� �� OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "������� �� ������������; "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "���� "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "�������� �������� ���������: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "�������� ���������: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "�������� �������� ���������: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "�������� ���������: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 ���� ��������\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d ����� ���������\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "����������"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "������������ `%s': %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "��������� �������� ��������:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " ��������� �����������:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " ��������� �������� ��������:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " ��������� �����������:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " ��������� �������� ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "������� ����������� `%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu ������� ����� �������� (%lu ���������)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu ������� ����� �������� (%lu ���������)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: ���������� �������������\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"����������� �� �� ������ ��� %08lX ���� %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
@@@ -5594,7 -4544,6 +5723,7 @@@ msgstr "��������������� �������� �� ���
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ������ ��� \""
@@@ -5642,261 -4582,209 +5771,261 @@@ msgstr "���������������� OK\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "���������������� �������: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "������ ����� �������='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "������� �������� ��� \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "��������� ��������� ���������\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "�������� ��������� ����� ��� ��������� ���������\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ������ ��� \""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
- #: g10/mainproc.c:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "������ ��������� ���: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[�������]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ������ ��� \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "�������"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "���������-��������"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "�������"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "�������� ���������� �������� ��������"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "�������� ������� ��� ���������: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "��� ����� ���������� ��������\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "���������� �������� ������ 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "�������� ������ ���� (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "�������� ��������� ��� �������: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: read ������� (n=%d): %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"����������� ��� ���������\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "�� ������������ ���������� ��������������"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s ��������, ���������� ��������� %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"����������� ��� ���������\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s ��������, ���������� ��������� %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "�������� �������������� �� \"%s%s\" ��������\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "����������"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "����������"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "�������� �������� ��� `%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "������� ����� ���������"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6091,31 -4946,24 +6220,31 @@@ msgstr "����� ���� � ���������� ����� (
msgid "unable to display photo ID!\n"
msgstr "�������� ����������� ��� photo ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "��� ���� ������� �����"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "�� ������ ���� ����������"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "�� ������ ���� �������"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "�� ������ �� ��������������� �����"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "�� User ID ��� ����� ����� ������"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "����� ��� ��������:"
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "������ ���������:"
@@@ -6129,100 -4977,81 +6258,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"��� ������ ���� ������������ ���:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " ������ ��� \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "���� �� ������ ������� ������ ���� ���������\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = ��� ����\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = ��� ��� �����������\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = ������������ �������\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = ���� ��� ������ �����\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = ��������� ����� ��� ��������\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " q = �����������\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "� ������� ���; "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "������� ������ ���� �� ������ �� ������� ��� �������� ������������; "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "������������� ��� ������� �� ��� ������ �������� ������������:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "���� �� ������ ������� ������ ���� ���������\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "���� �� ������ ������ �� ����\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6234,120 -5063,95 +6363,120 @@@ msgstr "
"�� ���������� ���� ������� ������� ����������\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "����� ���������� ����� ��� ��������; "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "�������������: ����� �������� ����� �����������!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
"���������)\n"
- #: g10/pkclist.c:546
++#: g10/pkclist.c:547
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr ""
"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
- #: g10/pkclist.c:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " ���� ������ �� �������� ��� � �������� ����� ������������.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr ""
"�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "��������: ���� �� ������ ���� ���������������.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "��������: ���� �� ������ ���� �����!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
"��������!\n"
- #: g10/pkclist.c:632
++#: g10/pkclist.c:633
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
- #: g10/pkclist.c:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "�������������: ��� �������������� ���� �� ������!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " � �������� ������ ����� ������������.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
"������� ������������!\n"
- #: g10/pkclist.c:651
++#: g10/pkclist.c:652
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
- #: g10/pkclist.c:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ������������: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
- #: g10/pkclist.c:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6355,76 -5159,59 +6484,76 @@@ msgstr "
"\n"
"�������������� �� user ID. ����� �� ��� ����� ������: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "��� ������� ���� �� user ID.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "�� ������� ������ ���� ���������������.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "������������: ������� ������ ���� ��� �������\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "������ ������ ���������\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "���������� ��������.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "�������� �� ����� ������� ���������: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "�������� ��� stdin ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "��� �������� ������������� ��������\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "�������� ��������� �������������� ��������� `%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "�������� ��������� �������������� ��������� `%s'\n"
@@@ -6463,8 -5243,6 +6592,8 @@@ msgstr "��������: �� ������� ������ %08
msgid "Note: key has been revoked"
msgstr "��������: �� ������ ���� ���������"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet �������: %s\n"
@@@ -6474,43 -5251,39 +6603,49 @@@
msgid "key %s has no user IDs\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "���� �������� ���:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(���� ����� ��� ��������� ������ ���������)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "�� ������� ������ ����� ���������.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "������������ ������ �� ����������� ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet �������: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "������������� ��������� �������������.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6518,19 -5291,27 +6653,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "�� ������� ������ `%s' �� �������: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6549,33 -5330,26 +6697,33 @@@ msgstr "
"������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
"�������� ��� �� ��� ����� ��������� �� ������!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "�������"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "�������������� ��� ����������� �������� ����� �� ��� ����� ������:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "����� ��� ��������: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(��� ������ ���������)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "����� ���� �������; "
@@@ -6601,42 -5371,35 +6749,42 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "�������������: ��������� ��������� ��������� ��� ������\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
"�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
"������������\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = ���������� ������������ �����������\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"�������������: �� ��������� ��������� %08lX ���� ����� ���' ������������� "
"�����������\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr ""
"�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr ""
"�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6644,7 -5407,6 +6792,7 @@@ msgstr "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6652,27 -5414,22 +6800,27 @@@ msgstr "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "��������: �� ������ ���� ���������"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
@@@ -6718,34 -5469,28 +6866,34 @@@ msgstr "
msgid "signing:"
msgstr "��������:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s ������������� �� ��������������\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
"������� RNG!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "������������ `%s': ������������\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"������������ `%s': ���� ����� ������������� ��� PGP ������ ElGamal ��� ��� "
"����� ������� ��� ���������!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@@ -6793,7 -5530,6 +6941,7 @@@ msgstr "������ ���� ������ ��� �������
msgid "read error in '%s': %s\n"
msgstr "������ ���������: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync �������: %s\n"
@@@ -6822,7 -5553,6 +6970,7 @@@ msgstr "trustdb rec %lu: �������� writ
msgid "trustdb transaction too large\n"
msgstr "���� ������ ��������� trustdb\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
@@@ -6939,121 -5646,97 +7087,121 @@@ msgstr "�������� ��������� ������� ����
msgid "input line longer than %d characters\n"
msgstr "������ ������� ���������� ��� %d ����������\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "`%s' ��� ����� ������ ����� keyID\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "������ %08lX: ������� ��� ������ �� �����������\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "�� ������ %08lX ������� ���� ��� ��� ���� ���� trustdb\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"������ %08lX: ������ ������� ������ ��� �� ������ �� ����������� - "
"���������\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "�������� �������� ��� �������� ������������.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "������� trust %lu, req ����� %d: read �������: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "�� ������� ������ %08lX ��� �������: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "�������� ����� ��� --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "������� ��� trustdb\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "�� �������� ������� ������������ �������\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@@ -7290,11 -5924,9 +7438,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7435,12 -6039,10 +7583,12 @@@ msgstr "%s ��������, ���������� �������
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "�� �������� ������ OpenPGP ��������.\n"
@@@ -7461,7 -6060,6 +7609,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7521,12 -6107,10 +7669,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7959,7 -6451,6 +8107,7 @@@ msgstr "�������� ����������� ��� ������
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "� ���������� �������� �������: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8557,7 -6928,6 +8705,7 @@@ msgstr "���� �������������
msgid " runtime cached certificates: %u\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "������������� ��������� �������������.\n"
@@@ -8567,8 -6936,6 +8715,8 @@@
msgid "certificate cached\n"
msgstr "� ���������� %c%lu ������������\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@@ -8630,7 -6986,6 +8778,7 @@@ msgstr "�������� block �������� �������
msgid "not removing file '%s'\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@@ -8856,185 -7167,149 +9004,185 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "�� ������ �������� ��� ��� agent\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "�������� ��������� ��� �������: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet �������: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "������� ��� `%s'\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "���������� ���� �������������� ���������"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "��������� ��������� ���������\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "�������� ����������� ��������� `%s': %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "�������� ����������� ��������� `%s': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "� ��������� �������� �������: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "������� ��� `%s'\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
@@@ -9042,36 -7317,29 +9190,36 @@@ msgstr "
"�������������: �� ������ ������� ������� random_seed - ���\n"
"��������������\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? �������� ���� ������ ���������: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
@@@ -9117,75 -7375,59 +9265,75 @@@ msgstr "������ ���� �� ���������� ��� `
msgid "error retrieving '%s': http status %u\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "�� ������ '%s' �� �������: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "������������� ��������� �������������.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "���� �������������"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "���� �������������"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "���� �������������"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "���� �������������"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "�������������� �� user ID ��� ����������� ��������: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9193,226 -7435,155 +9341,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "�������� �������� ��� `%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "� ���������� %c%lu ������������\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "��������: �� ������ ���� ���������"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: �������� ����������� hashtable: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "�������� �������� ��� `%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"��������������� ����������:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "����������� ����� ����������; "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9425,91 -7596,72 +9546,91 @@@ msgstr "
"@\n"
"(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "�����: gpg [��������] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "� ������ ����� ���� ������\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "������: �� ������ ���������\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "������ ���������: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "�� �������������"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9760,12 -7861,10 +9881,12 @@@ msgstr "��������� ��� \"%s\" ��� �� HK
msgid "malloc failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9800,11 -7893,10 +9921,12 @@@ msgstr "������ ���� ��� �������� ��� `%
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "�� ������ '%s' �� �������: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9952,72 -8014,61 +10074,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s: �������� ����������� hashtable: %s\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "�������� ������������ ��� cache �����������: %s\n"
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10274,11 -8265,9 +10401,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/en at boldquot.gmo
index 03ea69e,0000000..38f9f1d
mode 100644,000000..100644
Binary files differ
diff --cc po/en at boldquot.po
index 35d876e,0000000..4654197
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10088 -1,0 +1,10211 @@@
+# English translations for GNU gnupg package.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU gnupg package.
+# Automatically generated, 2015.
+#
+# 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.9\n"
++"Project-Id-Version: GNU gnupg 2.1.10\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-10-09 17:17+0200\n"
- "PO-Revision-Date: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
++"PO-Revision-Date: 2015-12-04 10:57+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c: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:722
++#: agent/call-pinentry.c:724
+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:744
++#: agent/call-pinentry.c:746
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
+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:857
++#: agent/call-pinentry.c:859
+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:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+msgid "PIN:"
+msgstr "PIN:"
+
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
+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:945
++#: agent/call-pinentry.c:947
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
+msgid "Repeat:"
+msgstr "Repeat:"
+
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
+msgid "PIN too long"
+msgstr "PIN too long"
+
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
+msgid "PIN too short"
+msgstr "PIN too short"
+
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
+#: agent/command-ssh.c:604 agent/command-ssh.c:699
+#, 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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
+#: agent/command-ssh.c:2437 agent/command-ssh.c:2455
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
+#: agent/command-ssh.c:2441
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
+#: agent/command-ssh.c:2446
+#, 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:2466
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
+#: agent/command-ssh.c:2516
+#, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "shadowing the key failed: %s\n"
+
+#: agent/command-ssh.c:2531
+#, c-format
+msgid "error writing key: %s\n"
+msgstr "error writing key: %s\n"
+
+#: agent/command-ssh.c:2814
+#, 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:2821
+msgid "Allow"
+msgstr "Allow"
+
+#: agent/command-ssh.c:2821
+msgid "Deny"
+msgstr "Deny"
+
+#: agent/command-ssh.c:2830
+#, 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:3069 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
+#: agent/command-ssh.c:3094
+#, 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:3614
+#, 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:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
+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:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
+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:147 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
+msgid "verbose"
+msgstr "verbose"
+
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
+#: agent/gpg-agent.c:165
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
+#: agent/gpg-agent.c:166 tools/symcryptrun.c:168
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
+#: agent/gpg-agent.c:168
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
+#: agent/gpg-agent.c:172
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
+#: agent/gpg-agent.c:174
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
+#: agent/gpg-agent.c:178
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
+#: agent/gpg-agent.c:194
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
+#: agent/gpg-agent.c:196
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
+#: agent/gpg-agent.c:199
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
+#: agent/gpg-agent.c:213
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
+#: agent/gpg-agent.c:215
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
+#: agent/gpg-agent.c:217
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “[1mtrusted[0m”"
+
+#: agent/gpg-agent.c:220
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
+#: agent/gpg-agent.c:222
+msgid "allow caller to override the pinentry"
+msgstr "allow caller to override the pinentry"
+
+#: agent/gpg-agent.c:224
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
+#: agent/gpg-agent.c:226
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: agent/gpg-agent.c:229
+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:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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:449
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
+#: agent/gpg-agent.c:451
+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:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘[1m%s[0m’ given\n"
+
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
+#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘[1m%s[0m’ is too long\n"
+
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
+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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘[1m%s[0m’ created\n"
+
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
+#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
+#, 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:2288
++#: agent/gpg-agent.c:2273
+#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
+msgid "no gpg-agent running in this session\n"
+msgstr "no gpg-agent running in this session\n"
+
+#: agent/preset-passphrase.c:100
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: agent/protect-tool.c:151
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
+
+#: agent/protect-tool.c:153
+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:683
+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:688
+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:694
+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:699
+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:710 tools/symcryptrun.c:454
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
+#: agent/protect-tool.c:712 tools/symcryptrun.c:450
+#, 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:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
+#, 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:427 agent/trustlist.c:496
+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:654
+#, 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:663 common/audit.c:467
+msgid "Yes"
+msgstr "Yes"
+
+#: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
+#: 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:697
+#, 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:711
+msgid "Correct"
+msgstr "Correct"
+
+#: agent/trustlist.c:711
+msgid "Wrong"
+msgstr "Wrong"
+
+#: agent/findkey.c:137
+#, 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:153
+#, 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:167 agent/findkey.c:174
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
+#: agent/findkey.c:175
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
+#: agent/findkey.c:1266
+#, 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:1290 agent/findkey.c:1304
+msgid "Delete key"
+msgstr "Delete key"
+
+#: agent/findkey.c:1301
+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:285 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:324 common/exechelp-w32.c:391
+#: common/exechelp-w32.c:415 common/exechelp-w32.c:445
+#: 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:337 common/exechelp-w32.c:401
+#: common/exechelp-w32.c:425 common/exechelp-w32.c:455
+#, 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:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
+#, c-format
+msgid "error forking process: %s\n"
+msgstr "error forking process: %s\n"
+
+#: common/exechelp-posix.c:539 common/exechelp-w32.c:702
+#: common/exechelp-w32ce.c:751
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr "waiting for process %d to terminate failed: %s\n"
+
+#: common/exechelp-posix.c:548
+#, c-format
+msgid "error running '%s': probably not installed\n"
+msgstr "error running '%s': probably not installed\n"
+
+#: common/exechelp-posix.c:554 common/exechelp-w32.c:716
+#: common/exechelp-w32ce.c:765
+#, c-format
+msgid "error running '%s': exit status %d\n"
+msgstr "error running '%s': exit status %d\n"
+
+#: common/exechelp-posix.c:562
+#, c-format
+msgid "error running '%s': terminated\n"
+msgstr "error running '%s': terminated\n"
+
+#: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
+#, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "error getting exit code of process %d: %s\n"
+
+#: common/simple-pwquery.c:376
+#, c-format
+msgid "can't connect to '%s': %s\n"
+msgstr "can't connect to '%s': %s\n"
+
+#: common/simple-pwquery.c:387
+msgid "communication problem with gpg-agent\n"
+msgstr "communication problem with gpg-agent\n"
+
+#: common/simple-pwquery.c:397
+msgid "problem setting the gpg-agent options\n"
+msgstr "problem setting the gpg-agent options\n"
+
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+msgid "canceled by user\n"
+msgstr "canceled by user\n"
+
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+msgid "problem with the agent\n"
+msgstr "problem with the agent\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:35 common/yesno.c:72
+msgid "yes"
+msgstr "yes"
+
+#: common/yesno.c:36 common/yesno.c:77
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:38 common/yesno.c:74
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:39 common/yesno.c:78
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:76
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:79
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:115
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:116
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:117
+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:132
+#, 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:135
+#, 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:479
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr "unknown debug flag ‘[1m%s[0m’ ignored\n"
+
+#: common/asshelp.c:410
+#, c-format
+msgid "no running gpg-agent - starting '%s'\n"
+msgstr "no running gpg-agent - starting ‘[1m%s[0m’\n"
+
+#: common/asshelp.c:470
+#, 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:478 common/asshelp.c:501
++#: common/asshelp.c:478
+msgid "connection to agent established\n"
+msgstr "connection to agent established\n"
+
+#: common/asshelp.c:518
+msgid "connection to agent is in restricted mode\n"
+msgstr "connection to agent is in restricted mode\n"
+
+#: common/asshelp.c:600
+#, c-format
+msgid "no running Dirmngr - starting '%s'\n"
+msgstr "no running Dirmngr - starting ‘[1m%s[0m’\n"
+
+#: common/asshelp.c:657
+#, 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:666 common/asshelp.c:697
++#: common/asshelp.c:666
+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:2882
+#, 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:989
+msgid "no CRL found for certificate"
+msgstr "no CRL found for certificate"
+
+#: common/audit.c:1114 sm/certchain.c:999
+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:860
+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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
+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/logging.c:933
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "you found a bug ... (%s:%d)\n"
+
+#: common/utf8conv.c:116
+#, 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:124
+#, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "iconv_open failed: %s\n"
+
+#: common/utf8conv.c:378 common/utf8conv.c:644
+#, 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:669
+#, c-format
+msgid "failed to create temporary file '%s': %s\n"
+msgstr "failed to create temporary file '%s': %s\n"
+
+#: common/dotlock.c:724
+#, c-format
+msgid "error writing to '%s': %s\n"
+msgstr "error writing to '%s': %s\n"
+
+#: common/dotlock.c:1056
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr "removing stale lockfile (created by %d)\n"
+
+#: common/dotlock.c:1092
+#, 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:1093
+msgid "(deadlock?) "
+msgstr "(deadlock?) "
+
+#: common/dotlock.c:1132
+#, c-format
+msgid "lock '%s' not made: %s\n"
+msgstr "lock ‘[1m%s[0m’ not made: %s\n"
+
+#: common/dotlock.c:1158
+#, c-format
+msgid "waiting for lock %s...\n"
+msgstr "waiting for lock %s...\n"
+
+#: g10/armor.c:377
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
+#: g10/armor.c:416
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
+#: g10/armor.c:427
+msgid "armor header: "
+msgstr "armor header: "
+
+#: g10/armor.c:440
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
+#: g10/armor.c:453
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
+#: g10/armor.c:506
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
+#: g10/armor.c:641
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
+#: g10/armor.c:654
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
+#: g10/armor.c:808 g10/armor.c:1424
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
+#: g10/armor.c:851
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
+#: g10/armor.c:885
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
+#: g10/armor.c:893
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
+#: g10/armor.c:897 g10/armor.c:1461
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
+#: g10/armor.c:917
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:921
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
+#: g10/armor.c:1238
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
+#: g10/armor.c:1243
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
+#: g10/armor.c:1247
+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:985
+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:997
+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:1003
+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:1021
+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:1055 g10/build-packet.c:1064
+msgid "WARNING: invalid notation data found\n"
+msgstr "WARNING: invalid notation data found\n"
+
+#: g10/build-packet.c:1086 g10/build-packet.c:1088
+msgid "not human readable"
+msgstr "not human readable"
+
+#: g10/call-agent.c:164 sm/call-agent.c:155
+#, c-format
+msgid "failed to proxy %s inquiry to client\n"
+msgstr "failed to proxy %s inquiry to client\n"
+
+#: g10/call-agent.c:189
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
+#, c-format
+msgid "OpenPGP card not available: %s\n"
+msgstr "OpenPGP card not available: %s\n"
+
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
+#, c-format
+msgid "OpenPGP card no. %s detected\n"
+msgstr "OpenPGP card no. %s detected\n"
+
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
+msgid "can't do this in batch mode\n"
+msgstr "can't do this in batch mode\n"
+
+#: g10/card-util.c:108
+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:110 scd/app-openpgp.c:2256
+msgid "Reset Code not or not anymore available\n"
+msgstr "Reset Code not or not anymore available\n"
+
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 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
++#: g10/card-util.c:280 g10/card-util.c:331
+msgid "[not set]"
+msgstr "[not set]"
+
- #: g10/card-util.c:528
++#: g10/card-util.c:534
+msgid "male"
+msgstr "male"
+
- #: g10/card-util.c:529
++#: g10/card-util.c:535
+msgid "female"
+msgstr "female"
+
- #: g10/card-util.c:529
++#: g10/card-util.c:535
+msgid "unspecified"
+msgstr "unspecified"
+
- #: g10/card-util.c:556
++#: g10/card-util.c:562
+msgid "not forced"
+msgstr "not forced"
+
- #: g10/card-util.c:556
++#: g10/card-util.c:562
+msgid "forced"
+msgstr "forced"
+
- #: g10/card-util.c:631
++#: g10/card-util.c:637
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
- #: g10/card-util.c:633
++#: g10/card-util.c:639
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “[1m<[0m” character may not be used.\n"
+
- #: g10/card-util.c:635
++#: g10/card-util.c:641
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
- #: g10/card-util.c:652
++#: g10/card-util.c:658
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
- #: g10/card-util.c:654
++#: g10/card-util.c:660
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
- #: g10/card-util.c:672
++#: g10/card-util.c:678
+#, 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:693
++#: g10/card-util.c:699
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
- #: g10/card-util.c:701
++#: g10/card-util.c:707
+#, 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:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error allocating enough memory: %s\n"
+
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
+#, c-format
+msgid "error reading '%s': %s\n"
+msgstr "error reading '%s': %s\n"
+
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
- #: g10/card-util.c:866
++#: g10/card-util.c:872
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
- #: g10/card-util.c:876
++#: g10/card-util.c:882
+#, c-format
+msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "Error: Login data too long (limit is %d characters).\n"
+
- #: g10/card-util.c:912
++#: g10/card-util.c:918
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
- #: g10/card-util.c:922
++#: g10/card-util.c:928
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "Error: Private DO too long (limit is %d characters).\n"
+
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
+msgid ""
+"Note: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+"Note: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
+
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
+#, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "What keysize do you want for the Signature key? (%u) "
+
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
+#, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "What keysize do you want for the Encryption key? (%u) "
+
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
+#, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "What keysize do you want for the Authentication key? (%u) "
+
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: 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:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 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:1323
++#: g10/card-util.c:1329
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr "The card will now be re-configured to generate a key of %u bits\n"
+
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
+#, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "error changing size of key %d to %u bits: %s\n"
+
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
+#, c-format
+msgid ""
+"Please note that the factory settings of the PINs are\n"
+" PIN = '%s' Admin PIN = '%s'\n"
+"You should change them using the command --change-pin\n"
+msgstr ""
+"Please note that the factory settings of the PINs are\n"
+" PIN = ‘[1m%s[0m’ Admin PIN = ‘[1m%s[0m’\n"
+"You should change them using the command --change-pin\n"
+
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
+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:1713
++#: g10/card-util.c:1719
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “[1myes[0m”) "
+
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
+msgid "quit this menu"
+msgstr "quit this menu"
+
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
+msgid "show admin commands"
+msgstr "show admin commands"
+
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
+msgid "show this help"
+msgstr "show this help"
+
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
+msgid "list all available data"
+msgstr "list all available data"
+
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
+msgid "change the login name"
+msgstr "change the login name"
+
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
+msgid "generate new keys"
+msgstr "generate new keys"
+
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “[1mhelp[0m”)\n"
+
+#: g10/decrypt.c:192 g10/encrypt.c:939
+msgid "--output doesn't work for this command\n"
+msgstr "--output doesn't work for this command\n"
+
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘[1m%s[0m’\n"
+
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “[1m%s[0m” not found: %s\n"
+
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
++#, c-format
++msgid "key \"%s\" not found\n"
++msgstr "key “[1m%s[0m” not found\n"
++
++#: g10/delkey.c:130 g10/delkey.c:137
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(unless you specify the key by fingerprint)\n"
+
- #: g10/delkey.c:134
++#: g10/delkey.c:136
+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:147
++#: g10/delkey.c:149
+msgid "Delete this key from the keyring? (y/N) "
+msgstr "Delete this key from the keyring? (y/N) "
+
- #: g10/delkey.c:157
++#: g10/delkey.c:159
+msgid "This is a secret key! - really delete? (y/N) "
+msgstr "This is a secret key! - really delete? (y/N) "
+
- #: g10/delkey.c:194
++#: g10/delkey.c:196
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
- #: g10/delkey.c:196
++#: g10/delkey.c:198
+msgid "key"
+msgstr "key"
+
- #: g10/delkey.c:196
++#: g10/delkey.c:198
+msgid "subkey"
+msgstr "subkey"
+
- #: g10/delkey.c:216
++#: g10/delkey.c:218
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
- #: g10/delkey.c:229
++#: g10/delkey.c:231
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
- #: g10/delkey.c:265
++#: g10/delkey.c:267
+#, 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:267
++#: g10/delkey.c:269
+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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: g10/encrypt.c:233
+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:247
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encrypt.c:257 g10/encrypt.c:617
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘[1m%s[0m’ already compressed\n"
+
+#: g10/encrypt.c:314 g10/encrypt.c:653 g10/sign.c:580
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘[1m%s[0m’ is an empty file\n"
+
+#: g10/encrypt.c:550
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘[1m%s[0m’\n"
+
+#: g10/encrypt.c:598
+#, 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:700 g10/sign.c:954
+#, 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:810
+#, 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:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
+#, 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/encrypt.c:909
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “[1m%s[0m”\n"
+
+#: g10/decrypt-data.c:94 g10/mainproc.c:307
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
+#: g10/decrypt-data.c:97 g10/mainproc.c:311
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "encrypted with unknown algorithm %d\n"
+
+#: g10/decrypt-data.c:165 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:177
+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:63
++#: g10/export.c:77
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
- #: g10/export.c:65
++#: g10/export.c:79
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
- #: g10/export.c:67
++#: g10/export.c:81
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “[1msensitive[0m”"
+
- #: g10/export.c:69
++#: g10/export.c:83
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
- #: g10/export.c:71
++#: g10/export.c:85
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
- #: g10/export.c:814
++#: g10/export.c:902
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:895
++#: g10/export.c:980
+#, 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:1081
++#: g10/export.c:1167
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
- #: g10/export.c:1179
++#: g10/export.c:1275
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1235
++#: g10/export.c:1337
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/getkey.c:230
++#: g10/getkey.c:234
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘[1m%s[0m’ via %s\n"
+
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘[1m%s[0m’ via %s: %s\n"
+
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
++#, c-format
++msgid "secret key \"%s\" not found: %s\n"
++msgstr "secret key “[1m%s[0m” not found: %s\n"
++
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
++#, c-format
++msgid "(check argument of option '%s')\n"
++msgstr "(check argument of option '%s')\n"
++
++#: g10/getkey.c:1216
++#, c-format
++msgid "using \"%s\" as default secret key\n"
++msgstr "using “[1m%s[0m” as default secret key\n"
++
++#: g10/getkey.c:1890
+#, 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:2588
++#: g10/getkey.c:2701
+#, 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:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:398
++#: g10/gpg.c:406
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:402
++#: g10/gpg.c:410
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:410
++#: g10/gpg.c:418
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:411
++#: g10/gpg.c:419
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:417
++#: g10/gpg.c:425
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:419
++#: g10/gpg.c:427
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:421
++#: g10/gpg.c:429
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:422
++#: g10/gpg.c:430
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:426
++#: g10/gpg.c:434
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:428
++#: g10/gpg.c:436
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:430
++#: g10/gpg.c:438
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:431
++#: g10/gpg.c:439
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:432
++#: g10/gpg.c:440
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:433
++#: g10/gpg.c:441
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:437
++#: g10/gpg.c:445
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:438
++#: g10/gpg.c:446
+msgid "export keys to a key server"
+msgstr "export keys to a key server"
+
- #: g10/gpg.c:439
++#: g10/gpg.c:447
+msgid "import keys from a key server"
+msgstr "import keys from a key server"
+
- #: g10/gpg.c:441
++#: g10/gpg.c:449
+msgid "search for keys on a key server"
+msgstr "search for keys on a key server"
+
- #: g10/gpg.c:443
++#: g10/gpg.c:451
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:448
++#: g10/gpg.c:456
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:451
++#: g10/gpg.c:459
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:452
++#: g10/gpg.c:460
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:453
++#: g10/gpg.c:461
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:465
++#: g10/gpg.c:473
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:474
++#: g10/gpg.c:482
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
++msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
++msgstr "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
++
++#: g10/gpg.c:491 sm/gpgsm.c:241
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
- #: g10/gpg.c:502
++#: g10/gpg.c:513
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:508
++#: g10/gpg.c:519
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
- #: g10/gpg.c:538
++#: g10/gpg.c:549
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:583
++#: g10/gpg.c:594
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
+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:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
+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:967
++#: g10/gpg.c:983
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:970
++#: g10/gpg.c:986
+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:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
+#, 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:1489
++#: g10/gpg.c:1505
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
+#, 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:1495
++#: g10/gpg.c:1511
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
+#, 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:1507
++#: g10/gpg.c:1523
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
+#, 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:1516
++#: g10/gpg.c:1532
+#, 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:1519
++#: g10/gpg.c:1535
+#, 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:1525
++#: g10/gpg.c:1541
+#, 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:1528
++#: g10/gpg.c:1544
+#, 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:1531
++#: g10/gpg.c:1547
+#, 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:1738
++#: g10/gpg.c:1754
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
++msgid "available TOFU policies:\n"
++msgstr "available TOFU policies:\n"
++
++#: g10/gpg.c:1998
++#, c-format
++msgid "unknown TOFU policy '%s'\n"
++msgstr "unknown TOFU policy ‘[1m%s[0m’\n"
++
++#: g10/gpg.c:2000 g10/gpg.c:2024
++msgid "(use \"help\" to list choices)\n"
++msgstr "(use “[1mhelp[0m” to list choices)\n"
++
++#: g10/gpg.c:2022
++#, c-format
++msgid "unknown TOFU DB format '%s'\n"
++msgstr "unknown TOFU DB format ‘[1m%s[0m’\n"
++
++#: g10/gpg.c:2085
+#, 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:2100
++#: g10/gpg.c:2188
++#, c-format
++msgid ""
++"Warning: value '%s' for option '%s' should be a long key ID or a "
++"fingerprint\n"
++msgstr ""
++"Warning: value ‘[1m%s[0m’ for option ‘[1m%s[0m’ should be a long key ID or a "
++"fingerprint\n"
++
++#: g10/gpg.c:2299
++#, c-format
++msgid "key specification '%s' is ambiguous\n"
++msgstr "key specification ‘[1m%s[0m’ is ambiguous\n"
++
++#. TRANSLATORS: The %s prints a key specification which
++#. for example has been given at the command line. Two
++#. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
++#, c-format
++msgid "'%s' matches at least:\n"
++msgstr "‘[1m%s[0m’ matches at least:\n"
++
++#: g10/gpg.c:2330 g10/revoke.c:682
++#, c-format
++msgid "error searching the keyring: %s\n"
++msgstr "error searching the keyring: %s\n"
++
++#: g10/gpg.c:2423
+#, 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:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
+#, 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:2779
++#: g10/gpg.c:3138
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
+#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
+#, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "will not run with insecure memory due to %s\n"
+
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth must be in the range from 1 to 255\n"
+
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
+
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "invalid S2K mode; must be 0, 1 or 3\n"
+
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
+#, 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:3497
++#: g10/gpg.c:3868
+#, 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:3502
++#: g10/gpg.c:3873
+#, 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:3595
++#: g10/gpg.c:3966
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
+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:3662
++#: g10/gpg.c:4047
++#, 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/gpg.c:4050
++#, 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/gpg.c:4064
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘[1m%s[0m’ failed: %s\n"
+
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
+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:3708
++#: g10/gpg.c:4110
+#, 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:3729
++#: g10/gpg.c:4131
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
+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:3768
++#: g10/gpg.c:4170
+#, 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:3792
++#: g10/gpg.c:4194
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
+msgid "--passwd <user-id>"
+msgstr "--passwd <user-id>"
+
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
++#, c-format
++msgid "error parsing key specification '%s': %s\n"
++msgstr "error parsing key specification '%s': %s\n"
++
++#: g10/gpg.c:4807
++#, 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:4854
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
- #: g10/gpgv.c:74
++#: 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:76
++#: g10/gpgv.c:77
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
+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:104
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
+#: g10/import.c:107
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
+#: g10/import.c:110
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
+#: g10/import.c:113
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
+#: g10/import.c:116
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
+#: g10/import.c:119
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
+#: g10/import.c:122
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
+#: g10/import.c:341
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
+#: g10/import.c:359
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
+#: g10/import.c:431
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
+#: g10/import.c:434
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
+#: g10/import.c:436
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
+#: g10/import.c:439
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
+#: g10/import.c:442 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
+#: g10/import.c:446 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
+#: g10/import.c:448
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
+#: g10/import.c:450
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
+#: g10/import.c:452
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
+#: g10/import.c:454
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
+#: g10/import.c:456 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
+#: g10/import.c:458 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
+#: g10/import.c:460 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
+#: g10/import.c:462 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
+#: g10/import.c:464
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
+#: g10/import.c:466
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
+#: g10/import.c:811
+#, 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:853
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:868
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for digest algorithm %s\n"
+
+#: g10/import.c:880
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for compression algorithm %s\n"
+
+#: g10/import.c:893
+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:895
+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:920
+#, 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:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
+#: g10/import.c:990
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
+#: g10/import.c:1021
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
+#: g10/import.c:1037
+#, 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:1047
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
+#: g10/import.c:1049
+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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
+#: g10/import.c:1068
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1079
++#: g10/import.c:1083
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
+#, c-format
+msgid "writing to '%s'\n"
+msgstr "writing to ‘[1m%s[0m’\n"
+
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1108
++#: g10/import.c:1112
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “[1m%s[0m” imported\n"
+
- #: g10/import.c:1132
++#: g10/import.c:1136
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
+#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
+#, 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:1194
++#: g10/import.c:1203
+#, 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:1197
++#: g10/import.c:1206
+#, 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:1200
++#: g10/import.c:1209
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “[1m%s[0m” 1 new signature\n"
+
- #: g10/import.c:1203
++#: g10/import.c:1212
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “[1m%s[0m” %d new signatures\n"
+
- #: g10/import.c:1206
++#: g10/import.c:1215
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “[1m%s[0m” 1 new subkey\n"
+
- #: g10/import.c:1209
++#: g10/import.c:1218
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “[1m%s[0m” %d new subkeys\n"
+
- #: g10/import.c:1212
++#: g10/import.c:1221
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signature cleaned\n"
+
- #: g10/import.c:1215
++#: g10/import.c:1224
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signatures cleaned\n"
+
- #: g10/import.c:1218
++#: g10/import.c:1227
+#, 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:1221
++#: g10/import.c:1230
+#, 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:1244
++#: g10/import.c:1253
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “[1m%s[0m” not changed\n"
+
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:1555
++#: g10/import.c:1568
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:1562
++#: g10/import.c:1575
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:1663
++#: g10/import.c:1680
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:1707
++#: g10/import.c:1724
+#, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "key %s: secret key with invalid cipher %d - skipped\n"
+
- #: g10/import.c:1808
++#. 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:1793
++#, 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:1844
+#, 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:1851
++#: g10/import.c:1893
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:1884
++#: g10/import.c:1926
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate imported\n"
+
- #: g10/import.c:1960
++#: g10/import.c:2002
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:1977
++#: g10/import.c:2019
+#, 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:1979
++#: g10/import.c:2021
+#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:1997
++#: g10/import.c:2039
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2011
++#: g10/import.c:2053
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2024
++#: g10/import.c:2066
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2040
++#: g10/import.c:2082
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2062
++#: g10/import.c:2104
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2075
++#: g10/import.c:2117
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2090
++#: g10/import.c:2132
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2135
++#: g10/import.c:2177
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “[1m%s[0m”\n"
+
- #: g10/import.c:2158
++#: g10/import.c:2200
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2187
++#: g10/import.c:2229
+#, 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:2198
++#: g10/import.c:2240
+#, 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:2216
++#: g10/import.c:2258
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2230
++#: g10/import.c:2272
+#, 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:2238
++#: g10/import.c:2280
+#, 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:2367
++#: g10/import.c:2409
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:2431
++#: g10/import.c:2473
+#, 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:2447
++#: g10/import.c:2489
+#, 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:2511
++#: g10/import.c:2553
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate added\n"
+
- #: g10/import.c:2549
++#: g10/import.c:2591
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:365 g10/keydb.c:392 sm/keydb.c:210
+#, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "error creating keybox '%s': %s\n"
+
+#: g10/keydb.c:368 g10/keydb.c:395
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:404 sm/keydb.c:217
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:406
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘[1m%s[0m’ created\n"
+
- #: g10/keydb.c:678
++#: g10/keydb.c:740
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
++#, c-format
++msgid "error opening key DB: %s\n"
++msgstr "error opening key DB: %s\n"
++
++#: g10/keydb.c:1599
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
+msgid "[revocation]"
+msgstr "[revocation]"
+
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
+msgid "1 bad signature\n"
+msgstr "1 bad signature\n"
+
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d bad signatures\n"
+
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 signature not checked due to a missing key\n"
+
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d signatures not checked due to missing keys\n"
+
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
+msgid "1 signature not checked due to an error\n"
+msgstr "1 signature not checked due to an error\n"
+
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d signatures not checked due to errors\n"
+
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "1 user ID without valid self-signature detected\n"
+
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "%d user IDs without valid self-signatures detected\n"
+
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
+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:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
+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:491
++#: g10/keyedit.c:493
+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:618
++#: g10/keyedit.c:621
++#, 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:629
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “[1m%s[0m” is revoked."
+
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
+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:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “[1m%s[0m” is expired."
+
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “[1m%s[0m” is not self-signed."
+
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “[1m%s[0m” is signable. "
+
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
+#, 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:741
++#: g10/keyedit.c:752
+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:754
++#: g10/keyedit.c:765
+#, 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:759
++#: g10/keyedit.c:770
+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:780
++#: g10/keyedit.c:791
+#, 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:785
++#: g10/keyedit.c:796
+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:805
++#: g10/keyedit.c:816
+#, 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:809
++#: g10/keyedit.c:820
+#, 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:814
++#: g10/keyedit.c:825
+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:836
++#: g10/keyedit.c:847
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
+#, 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:876
++#: g10/keyedit.c:887
+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:917
++#: g10/keyedit.c:928
+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:922
++#: g10/keyedit.c:933
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
+#, 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:926
++#: g10/keyedit.c:937
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
+#, 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:936
++#: g10/keyedit.c:947
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘[1m?[0m’ for more information): "
+
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
+#, 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:971
++#: g10/keyedit.c:982
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
+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:983
++#: g10/keyedit.c:994
+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:993
++#: g10/keyedit.c:1004
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
+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:1196
++#: g10/keyedit.c:1207
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
+msgid "moving a key signature to the correct place\n"
+msgstr "moving a key signature to the correct place\n"
+
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
+msgid "save and quit"
+msgstr "save and quit"
+
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
+msgid "select user ID N"
+msgstr "select user ID N"
+
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
+msgid "select subkey N"
+msgstr "select subkey N"
+
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
+msgid "check signatures"
+msgstr "check signatures"
+
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
+msgid "add a user ID"
+msgstr "add a user ID"
+
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
+msgid "add a subkey"
+msgstr "add a subkey"
+
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
+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:1406
++#: g10/keyedit.c:1417
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
+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:1417
++#: g10/keyedit.c:1428
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
+msgid "enable key"
+msgstr "enable key"
+
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
+msgid "disable key"
+msgstr "disable key"
+
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
+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:1439
++#: g10/keyedit.c:1450
+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:1551
++#: g10/keyedit.c:1562
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
+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:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
++msgid "Really sign all text user IDs? (y/N) "
++msgstr "Really sign all text user IDs? (y/N) "
++
++#: g10/keyedit.c:1773
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘[1m%s[0m’\n"
+
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
+#, 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:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘[1m%s[0m’ command.)\n"
+
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
+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:1875
++#: g10/keyedit.c:1896
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
+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:2005
++#: g10/keyedit.c:2026
+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:2043
++#: g10/keyedit.c:2064
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
+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:2073
++#: g10/keyedit.c:2094
+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:2075
++#: g10/keyedit.c:2096
+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:2124
++#: g10/keyedit.c:2145
+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:2169
++#: g10/keyedit.c:2190
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
+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:2178
++#: g10/keyedit.c:2199
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "secret key “[1m%s[0m” not found: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“[1m%s[0m” is not a fingerprint\n"
+
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“[1m%s[0m” is not the primary fingerprint\n"
+
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
+msgid "Digest: "
+msgstr "Digest: "
+
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
+msgid "Features: "
+msgstr "Features: "
+
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
+msgid "Notations: "
+msgstr "Notations: "
+
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
+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:3058
++#: g10/keyedit.c:3096
+#, 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:3082
++#: g10/keyedit.c:3120
+#, 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:3088
++#: g10/keyedit.c:3126
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
+msgid "card-no: "
+msgstr "card-no: "
+
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
+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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
+msgid "revoked"
+msgstr "revoked"
+
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
+msgid "expired"
+msgstr "expired"
+
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
+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:3461
++#: g10/keyedit.c:3499
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
+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:3521
++#: g10/keyedit.c:3559
+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:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
+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:3532
++#: g10/keyedit.c:3570
+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:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
+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:3646
++#: g10/keyedit.c:3684
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Deleted %d signature.\n"
+
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Deleted %d signatures.\n"
+
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
+msgid "invalid"
+msgstr "invalid"
+
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “[1m%s[0m” compacted: %s\n"
+
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "User ID “[1m%s[0m”: %d signature removed\n"
+
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
+#, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "User ID “[1m%s[0m”: %d signatures removed\n"
+
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “[1m%s[0m”: already minimized\n"
+
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “[1m%s[0m”: already clean\n"
+
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
+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:3821
++#: g10/keyedit.c:3859
+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:3838
++#: g10/keyedit.c:3876
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
+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:3878
++#: g10/keyedit.c:3916
+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:3900
++#: g10/keyedit.c:3938
+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:3919
++#: g10/keyedit.c:3957
+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:3925
++#: g10/keyedit.c:3963
+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:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Please select at most one subkey.\n"
++#: g10/keyedit.c:4014
++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:3978
++#: g10/keyedit.c:4019
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
+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:4095
++#: g10/keyedit.c:4140
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
+#, 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:4216
++#: g10/keyedit.c:4261
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
+#, 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:4428
++#: g10/keyedit.c:4473
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
+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:4508
++#: g10/keyedit.c:4553
+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:4567
++#: g10/keyedit.c:4612
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
++#, c-format
++msgid "No subkey with key ID '%s'.\n"
++msgstr "No subkey with key ID '%s'.\n"
++
++#: g10/keyedit.c:5014
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “[1m%s[0m”\n"
+
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
+#, 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:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
+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:5042
++#: g10/keyedit.c:5174
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
+#, 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:5131
++#: g10/keyedit.c:5263
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “[1m%s[0m” is already revoked\n"
+
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
+#, 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:5373
++#: g10/keyedit.c:5505
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
+#, 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:276
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘[1m%s[0m’ duplicated\n"
+
+#: g10/keygen.c:283
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:285
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:287
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: g10/keygen.c:428
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘[1m%s[0m’ in preference string\n"
+
+#: g10/keygen.c:907
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:953
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:1009
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1470
+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:1639
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1642
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1645
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1648
+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:1666
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1690
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1694
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1699
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1702
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1705
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1708
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1837 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:1841
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1845
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1847
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1849
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1854
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1856
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1861
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1863
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1869
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
+#: g10/keygen.c:1871
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
+#: g10/keygen.c:1873
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
+#: g10/keygen.c:1875
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
+#: g10/keygen.c:1879
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: g10/keygen.c:1969 sm/certreqgen-ui.c:206
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
+#: g10/keygen.c:1982 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:1984 sm/certreqgen-ui.c:216
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
+#: g10/keygen.c:2060
+#, 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:2068
+#, 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:2071 sm/certreqgen-ui.c:183
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:2085 sm/certreqgen-ui.c:193
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:2103 g10/keygen.c:2117
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
+#: g10/keygen.c:2162
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
+#: g10/keygen.c:2340
+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:2351
+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:2374
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:2379
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:2398 g10/keygen.c:2423
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:2405
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:2406
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:2411
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:2412
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:2416
+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:2429
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:2497
+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:2512
+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:2531
+msgid "Real name: "
+msgstr "Real name: "
+
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:2541
++#, 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:2545
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
+msgid "Email address: "
+msgstr "Email address: "
+
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
+msgid "Comment: "
+msgstr "Comment: "
+
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
+#, 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:2605
++#: g10/keygen.c:2609
+#, 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:2610
++#: g10/keygen.c:2614
+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:2635
++#: g10/keygen.c:2639
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
+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:2646
++#: g10/keygen.c:2650
+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:2651
++#: g10/keygen.c:2655
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
+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:2671
++#: g10/keygen.c:2675
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
+msgid "passphrase not correctly repeated; try again"
+msgstr "passphrase not correctly repeated; try again"
+
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway. You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway. You can change your passphrase at any time,\n"
+"using this program with the option “[1m--edit-key[0m”.\n"
+"\n"
+
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
+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:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
+#, 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:3518
++#: g10/keygen.c:3522
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “[1m%s[0m” already exists\n"
+
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
+#, 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:3834
++#: g10/keygen.c:3841
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘[1m%s[0m’\n"
+
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
+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:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
+#, 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:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
+#, 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:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
+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:4291
++#: g10/keygen.c:4304
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
+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:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
+#, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "storing key onto card failed: %s\n"
+
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
+#, 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/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
+msgid "never "
+msgstr "never "
+
- #: g10/keylist.c:309
++#: g10/keylist.c:331
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
- #: g10/keylist.c:311
++#: g10/keylist.c:333
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
- #: g10/keylist.c:353
++#: g10/keylist.c:375
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
- #: g10/keylist.c:406
++#: g10/keylist.c:428
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
- #: g10/keylist.c:408
++#: g10/keylist.c:430
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
- #: g10/keylist.c:446
++#: g10/keylist.c:468
+msgid "1 good signature\n"
+msgstr "1 good signature\n"
+
- #: g10/keylist.c:448
++#: g10/keylist.c:470
+#, c-format
+msgid "%d good signatures\n"
+msgstr "%d good signatures\n"
+
- #: g10/keylist.c:543
++#: g10/keylist.c:565
+#, c-format
+msgid "Warning: %lu key(s) skipped due to their large size\n"
+msgstr "Warning: %lu key(s) skipped due to their large size\n"
+
- #: g10/keylist.c:563
++#: g10/keylist.c:585
+msgid "Keyring"
+msgstr "Keyring"
+
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “[1m%s[0m”: %s\n"
+
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
+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:1864
++#: g10/keylist.c:1898
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
+#, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "renaming ‘[1m%s[0m’ to ‘[1m%s[0m’ failed: %s\n"
+
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘[1m%s[0m’\n"
+
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
+#, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu keys cached so far (%lu signatures)\n"
+
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
+#, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu keys cached (%lu signatures)\n"
+
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
+msgid "override proxy options set for dirmngr"
+msgstr "override proxy options set for dirmngr"
+
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
+msgid "override timeout options set for dirmngr"
+msgstr "override timeout options set for dirmngr"
+
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr "honor the PKA record set on a key when retrieving keys"
+
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
+msgid "disabled"
+msgstr "disabled"
+
- #: g10/keyserver.c:755
++#: 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:861
++#: 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:1002 g10/keyserver.c:1117
++#: 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:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
+#, c-format
+msgid "refreshing 1 key from %s\n"
+msgstr "refreshing 1 key from %s\n"
+
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
+#, 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:1439
++#: g10/keyserver.c:1442
+#, c-format
+msgid "refreshing %d keys from %s\n"
+msgstr "refreshing %d keys from %s\n"
+
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “[1m%s[0m” not found on keyserver\n"
+
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
+#, c-format
+msgid "sending key %s to %s server %s\n"
+msgstr "sending key %s to %s server %s\n"
+
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘[1m%s[0m’\n"
+
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
+#: g10/mainproc.c:257
+#, 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:305
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
+#: g10/mainproc.c:315
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
+#: g10/mainproc.c:381
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
+#: g10/mainproc.c:459
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
+#: g10/mainproc.c:492
+#, 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:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “[1m%s[0m”\n"
+
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
+#: g10/mainproc.c:517
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
+#: g10/mainproc.c:533
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
+#: g10/mainproc.c:535
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
+#: g10/mainproc.c:569 g10/mainproc.c:590
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
+#: g10/mainproc.c:576
+#, 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:621 g10/mainproc.c:635
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
+#: g10/mainproc.c:631
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
+#: g10/mainproc.c:640
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "cleared passphrase cached with ID: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “[1mfor-your-eyes-only[0m”\n"
+
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “[1mgpg --import[0m” to apply\n"
+
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
+#, 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:1729
++#: g10/mainproc.c:1746
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “[1m%s[0m”"
+
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
+#, 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:2104
++#: g10/mainproc.c:2144
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
+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:2254
++#: g10/mainproc.c:2294
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
+msgid "old style (PGP 2.x) signature\n"
+msgstr "old style (PGP 2.x) signature\n"
+
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
+#, 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:171
++#: g10/misc.c:172
+#, c-format
+msgid "fstat(%d) failed in %s: %s\n"
+msgstr "fstat(%d) failed in %s: %s\n"
+
- #: g10/misc.c:280
++#: g10/misc.c:281
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "WARNING: using experimental public key algorithm %s\n"
+
- #: g10/misc.c:287
++#: g10/misc.c:288
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+
- #: g10/misc.c:301
++#: g10/misc.c:302
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "WARNING: using experimental cipher algorithm %s\n"
+
- #: g10/misc.c:317
++#: g10/misc.c:321
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "WARNING: using experimental digest algorithm %s\n"
+
- #: g10/misc.c:324
++#: g10/misc.c:330
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNING: digest algorithm %s is deprecated\n"
+
- #: g10/misc.c:339
++#: g10/misc.c:355
+#, 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:997
++#: g10/misc.c:1012
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “[1m%s[0m”\n"
+
- #: g10/misc.c:1001
++#: g10/misc.c:1016
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated option\n"
+
- #: g10/misc.c:1003
++#: g10/misc.c:1018
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “[1m%s%s[0m” instead\n"
+
- #: g10/misc.c:1010
++#: g10/misc.c:1025
+#, 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:1020
++#: g10/misc.c:1035
+#, 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:1024
++#: g10/misc.c:1039
+#, 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:1088
++#: g10/misc.c:1103
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
- #: g10/misc.c:1233
++#: g10/misc.c:1248
+#, 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:1408
++#: g10/misc.c:1423
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘[1m%s[0m’\n"
+
- #: g10/misc.c:1433
++#: g10/misc.c:1448
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘[1m%s[0m’\n"
+
- #: g10/misc.c:1671
++#: g10/misc.c:1686
+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:1708
++#, c-format
++msgid "unknown weak digest '%s'\n"
++msgstr "unknown weak digest ‘[1m%s[0m’\n"
++
+#: g10/openfile.c:85
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘[1m%s[0m’ exists. "
+
+#: g10/openfile.c:89
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:124
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:148
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:219
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:367
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘[1m%s[0m’\n"
+
+#: g10/openfile.c:458
+#, c-format
+msgid "new configuration file '%s' created\n"
+msgstr "new configuration file ‘[1m%s[0m’ created\n"
+
+#: g10/openfile.c:499
+#, 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:258
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
+#: g10/parse-packet.c:1114
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
+#: g10/parse-packet.c:1632
+#, 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:74 g10/passphrase.c:332 g10/passphrase.c:394
+#, c-format
+msgid "problem with the agent: %s\n"
+msgstr "problem with the agent: %s\n"
+
+#: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
+#: g10/passphrase.c:278
+#, 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:297
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
+#: g10/passphrase.c:326
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
+#: g10/passphrase.c:484
+#, 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:492
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
+#: g10/passphrase.c:501
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
+#: g10/passphrase.c:666
+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:670
+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:675
+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:678
+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:683
+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:686
+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:695
+#, 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:379
+msgid "unable to display photo ID!\n"
+msgstr "unable to display photo ID!\n"
+
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
+msgid "No reason specified"
+msgstr "No reason specified"
+
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
+msgid "User ID is no longer valid"
+msgstr "User ID is no longer valid"
+
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
+msgid "reason for revocation: "
+msgstr "reason for revocation: "
+
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
+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:217
++#: g10/pkclist.c:218
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
+
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
+#, c-format
+msgid " aka \"%s\"\n"
+msgstr " aka “[1m%s[0m”\n"
+
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
+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:283
++#: g10/pkclist.c:284
+#, 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:285
++#: g10/pkclist.c:286
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = I do NOT trust\n"
+
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = I trust ultimately\n"
+
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
+msgid " m = back to the main menu\n"
+msgstr " m = back to the main menu\n"
+
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
+msgid " s = skip this key\n"
+msgstr " s = skip this key\n"
+
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
+msgid " q = quit\n"
+msgstr " q = quit\n"
+
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
+#, 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:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
+msgid "Your decision? "
+msgstr "Your decision? "
+
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
+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:346
++#: g10/pkclist.c:347
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificates leading to an ultimately trusted key:\n"
+
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
+#, 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:440
++#: g10/pkclist.c:441
+#, 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:446
++#: g10/pkclist.c:447
+msgid "This key probably belongs to the named user\n"
+msgstr "This key probably belongs to the named user\n"
+
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr "This key belongs to us\n"
+
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
+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:496
++#: g10/pkclist.c:497
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
+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:546
++#: g10/pkclist.c:547
+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:549
++#: g10/pkclist.c:550
+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:550
++#: g10/pkclist.c:551
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
+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:561
++#: g10/pkclist.c:562
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
+#, 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:588
++#: g10/pkclist.c:589
+#, 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:600
++#: g10/pkclist.c:601
+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:608
++#: g10/pkclist.c:609
+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:619
++#: g10/pkclist.c:620
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
+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:632
++#: g10/pkclist.c:633
+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:640
++#: g10/pkclist.c:641
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
+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:651
++#: g10/pkclist.c:652
+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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
+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:1039
++#: g10/pkclist.c:1040
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
+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:1089
++#: g10/pkclist.c:1090
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “[1m%s[0m”\n"
+
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
+#, 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:109
++#: g10/plaintext.c:85
+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:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
+#, c-format
+msgid "can't open signed data '%s'\n"
+msgstr "can't open signed data ‘[1m%s[0m’\n"
+
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
+#, 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:117
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:124
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:283
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:311
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "cipher algorithm %d%s is unknown or disabled\n"
+
+#: g10/pubkey-enc.c:353
+#, 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:378
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:385
+msgid "Note: key has been revoked"
+msgstr "Note: key has been revoked"
+
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:145
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
- #: g10/revoke.c:308
++#: g10/revoke.c:313
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
- #: g10/revoke.c:312
++#: g10/revoke.c:317
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
- #: g10/revoke.c:316
++#: g10/revoke.c:323
++msgid "Secret key is not available.\n"
++msgstr "Secret key is not available.\n"
++
++#: g10/revoke.c:328
+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:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
- #: g10/revoke.c:408
++#: g10/revoke.c:416
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
- #: g10/revoke.c:414
++#: g10/revoke.c:422
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “[1m%s[0m”\n"
+
- #: g10/revoke.c:544
++#: g10/revoke.c:552
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
- #: g10/revoke.c:560
++#: g10/revoke.c:568
+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."
+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."
+
- #: g10/revoke.c:564
++#: g10/revoke.c:572
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before making use of this revocation certificate."
+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 making use of this revocation certificate."
+
- #: g10/revoke.c:645
++#: g10/revoke.c:628
++#, 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:655
++#, c-format
++msgid "'%s' matches multiple secret keys:\n"
++msgstr "‘[1m%s[0m’ matches multiple secret keys:\n"
++
++#: g10/revoke.c:705
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
- #: g10/revoke.c:669
++#: g10/revoke.c:729
+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:703
++#: g10/revoke.c:763
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
- #: g10/revoke.c:713
++#: g10/revoke.c:773
+msgid "Cancel"
+msgstr "Cancel"
+
- #: g10/revoke.c:715
++#: g10/revoke.c:775
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
- #: g10/revoke.c:756
++#: g10/revoke.c:816
+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:784
++#: g10/revoke.c:844
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
- #: g10/revoke.c:786
++#: g10/revoke.c:846
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
- #: g10/revoke.c:791
++#: g10/revoke.c:851
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: g10/seskey.c:61 sm/encrypt.c:123
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
+#: g10/seskey.c:65
+#, 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:298
+#, 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:316
+#, 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:81
++#: g10/sig-check.c:113
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
+#, 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:110
++#: g10/sig-check.c:142
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
+#, 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:222
++#: g10/sig-check.c:271
+#, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "public key %s is %lu second newer than the signature\n"
+
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
+#, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "public key %s is %lu seconds newer than the signature\n"
+
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
+#, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
+#, 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:607
++#: g10/sig-check.c:765
+#, 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:634
++#: g10/sig-check.c:792
+#, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "key %s: no subkey for subkey binding signature\n"
+
+#: g10/sign.c:89
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+
+#: g10/sign.c:115
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+
+#: g10/sign.c:138
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+
+#: g10/sign.c:301
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “[1m%s[0m”\n"
+
+#: g10/sign.c:848
+#, 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:979
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1254
++#: g10/sign.c:1255
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
+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:180
++#: g10/skclist.c:181
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “[1m%s[0m”: duplicated\n"
+
- #: g10/skclist.c:199
++#: g10/skclist.c:200
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
- #: g10/skclist.c:218
++#: g10/skclist.c:219
+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:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
+#, 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:106
+#, 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:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
+#, c-format
+msgid "error in '%s': %s\n"
+msgstr "error in '%s': %s\n"
+
+#: g10/tdbdump.c:163
+msgid "line too long"
+msgstr "line too long"
+
+#: g10/tdbdump.c:171
+msgid "colon missing"
+msgstr "colon missing"
+
+#: g10/tdbdump.c:177
+msgid "invalid fingerprint"
+msgstr "invalid fingerprint"
+
+#: g10/tdbdump.c:182
+msgid "ownertrust value missing"
+msgstr "ownertrust value missing"
+
+#: g10/tdbdump.c:218
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
+#: g10/tdbdump.c:222
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
+#: g10/tdbio.c:141 sm/keydb.c:339
+#, 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:1768
+#, 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:1779
+#, 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:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
+#, c-format
+msgid "can't access '%s': %s\n"
+msgstr "can't access '%s': %s\n"
+
+#: g10/tdbio.c:688
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
+#: g10/tdbio.c:711
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
+#: g10/tdbio.c:716
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
+#: g10/tdbio.c:719
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
+#: g10/tdbio.c:776
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
+#: g10/tdbio.c:785
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
+#: g10/tdbio.c:822
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
+#: g10/tdbio.c:830
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
+#: g10/tdbio.c:853 g10/tdbio.c:879 g10/tdbio.c:897 g10/tdbio.c:917
+#: g10/tdbio.c:952 g10/tdbio.c:1692 g10/tdbio.c:1721
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
+#: g10/tdbio.c:926
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
+#: g10/tdbio.c:1451
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
+#: g10/tdbio.c:1462
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
+#: g10/tdbio.c:1487
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
+#: g10/tdbio.c:1509
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
+#: g10/tdbio.c:1515
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
+#: g10/tdbio.c:1729
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
+#: g10/tdbio.c:1738
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
+#: g10/tdbio.c:1749
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
+#: g10/tdbio.c:1785
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
+#: g10/tdbio.c:1846
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
+#: g10/textfilter.c:147
+#, 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:242
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "‘[1m%s[0m’ is not a valid long keyID\n"
+
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
+#, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "key %s occurs more than once in the trustdb\n"
+
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
+#, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "key %s: no public key for trusted key - skipped\n"
+
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
+#, 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:339
++#: g10/trustdb.c:347
+#, 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:412
++#: g10/trustdb.c:422
+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:421
++#: g10/trustdb.c:431
+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:456
++#: g10/trustdb.c:468
+#, 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:462
++#: g10/trustdb.c:474
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
- #: g10/trustdb.c:511
++#: 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:526
++#: 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:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d keys processed (%d validity counts cleared)\n"
+
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
+#, 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:1829
++#: g10/trustdb.c:1958
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
+#, 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:1990
++#: g10/trustdb.c:2123
+#, 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:106
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trust.c:107
+msgid "never"
+msgstr "never"
+
+#: g10/trust.c:108
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trust.c:109
+msgid "full"
+msgstr "full"
+
+#: g10/trust.c:110
+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:147
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
+#: g10/trust.c:150
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trust.c:152 g10/trust.c:158
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trust.c:157
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trust.c:159
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: 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:118
+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:205
+#, 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:254
+#, 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:2992
+#, 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:3004
+#, 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:1938 scd/app-openpgp.c:1955 scd/app-openpgp.c:2219
+#: scd/app-openpgp.c:2266 scd/app-openpgp.c:2371 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:2300 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:3597
+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:3605
+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:3615
+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:2213
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:1783 scd/app-openpgp.c:1962 scd/app-openpgp.c:2226
+#, 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:1974
+#: scd/app-openpgp.c:3924
+#, 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:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
+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:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:1877
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%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:1884
+#, 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:1888
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:1909
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2262
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2272 scd/app-openpgp.c:2326
+#, 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:2295
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2296
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2296
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2367
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2368
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2424 scd/app-openpgp.c:3683
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2430 scd/app-openpgp.c:3690
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2440
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2444
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2446
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2448
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:2972 scd/app-openpgp.c:3323
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3014 scd/app-openpgp.c:3022
+#, 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:3155 scd/app-openpgp.c:3415
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3317
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3574
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3587
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3590
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "key generation completed (%d seconds)\n"
+
+#: scd/app-openpgp.c:3648
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:3698
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:3814
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:3899
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
+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:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
+#, 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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LEVEL|set the debugging level to LEVEL"
+
+#: scd/scdaemon.c:132 tools/gpgconf-comp.c:651
+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:286
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
+#: scd/scdaemon.c:288
+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:802
+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:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
+#, 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:221 tools/gpg-connect-agent.c:2238
+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:525
+msgid "looking up issuer at external location\n"
+msgstr "looking up issuer at external location\n"
+
+#: sm/certchain.c:544
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr "number of issuers matching: %d\n"
+
+#: sm/certchain.c:588
+msgid "looking up issuer from the Dirmngr cache\n"
+msgstr "looking up issuer from the Dirmngr cache\n"
+
+#: sm/certchain.c:612
+#, c-format
+msgid "number of matching certificates: %d\n"
+msgstr "number of matching certificates: %d\n"
+
+#: sm/certchain.c:614
+#, c-format
+msgid "dirmngr cache-only key lookup failed: %s\n"
+msgstr "dirmngr cache-only key lookup failed: %s\n"
+
+#: sm/certchain.c:813 sm/certchain.c:1307 sm/certchain.c:1947 sm/decrypt.c:262
+#: sm/encrypt.c:339 sm/import.c:410 sm/keydb.c:1109 sm/keydb.c:1195
+#: 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:979
+msgid "certificate has been revoked"
+msgstr "certificate has been revoked"
+
+#: sm/certchain.c:994
+msgid "the status of the certificate is unknown"
+msgstr "the status of the certificate is unknown"
+
+#: sm/certchain.c:1001
+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:1007
+#, c-format
+msgid "checking the CRL failed: %s"
+msgstr "checking the CRL failed: %s"
+
+#: sm/certchain.c:1036 sm/certchain.c:1104 dirmngr/validate.c:473
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "certificate with invalid validity: %s"
+
+#: sm/certchain.c:1051 sm/certchain.c:1136 dirmngr/validate.c:491
+msgid "certificate not yet valid"
+msgstr "certificate not yet valid"
+
+#: sm/certchain.c:1052 sm/certchain.c:1137
+msgid "root certificate not yet valid"
+msgstr "root certificate not yet valid"
+
+#: sm/certchain.c:1053 sm/certchain.c:1138
+msgid "intermediate certificate not yet valid"
+msgstr "intermediate certificate not yet valid"
+
+#: sm/certchain.c:1066 dirmngr/validate.c:502
+msgid "certificate has expired"
+msgstr "certificate has expired"
+
+#: sm/certchain.c:1067
+msgid "root certificate has expired"
+msgstr "root certificate has expired"
+
+#: sm/certchain.c:1068
+msgid "intermediate certificate has expired"
+msgstr "intermediate certificate has expired"
+
+#: sm/certchain.c:1110
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr "required certificate attributes missing: %s%s%s"
+
+#: sm/certchain.c:1119
+msgid "certificate with invalid validity"
+msgstr "certificate with invalid validity"
+
+#: sm/certchain.c:1156
+msgid "signature not created during lifetime of certificate"
+msgstr "signature not created during lifetime of certificate"
+
+#: sm/certchain.c:1158
+msgid "certificate not created during lifetime of issuer"
+msgstr "certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1159
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr "intermediate certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1163
+msgid " ( signature created at "
+msgstr " ( signature created at "
+
+#: sm/certchain.c:1164
+msgid " (certificate created at "
+msgstr " (certificate created at "
+
+#: sm/certchain.c:1167
+msgid " (certificate valid from "
+msgstr " (certificate valid from "
+
+#: sm/certchain.c:1168
+msgid " ( issuer valid from "
+msgstr " ( issuer valid from "
+
+#: sm/certchain.c:1198 dirmngr/validate.c:552
+#, c-format
+msgid "fingerprint=%s\n"
+msgstr "fingerprint=%s\n"
+
+#: sm/certchain.c:1207
+msgid "root certificate has now been marked as trusted\n"
+msgstr "root certificate has now been marked as trusted\n"
+
+#: sm/certchain.c:1220
+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:1226
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr "interactive marking as trusted disabled for this session\n"
+
+#: sm/certchain.c:1284
+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:1348
+msgid "no issuer found in certificate"
+msgstr "no issuer found in certificate"
+
+#: sm/certchain.c:1429
+msgid "self-signed certificate has a BAD signature"
+msgstr "self-signed certificate has a BAD signature"
+
+#: sm/certchain.c:1498 dirmngr/validate.c:550
+msgid "root certificate is not marked trusted"
+msgstr "root certificate is not marked trusted"
+
+#: sm/certchain.c:1514
+#, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "checking the trust list failed: %s\n"
+
+#: sm/certchain.c:1545 sm/import.c:176 dirmngr/validate.c:605
+msgid "certificate chain too long\n"
+msgstr "certificate chain too long\n"
+
+#: sm/certchain.c:1557 dirmngr/validate.c:617
+msgid "issuer certificate not found"
+msgstr "issuer certificate not found"
+
+#: sm/certchain.c:1590 dirmngr/validate.c:643
+msgid "certificate has a BAD signature"
+msgstr "certificate has a BAD signature"
+
+#: sm/certchain.c:1621 dirmngr/validate.c:667
+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
+#, 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
+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
+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
+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
+#, 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
+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
+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
+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
+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
+msgid "certificate is not usable for encryption\n"
+msgstr "certificate is not usable for encryption\n"
+
+#: sm/certlist.c:168 dirmngr/validate.c:1135
+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:1309
++#: 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:1205 sm/keydb.c:1307
+#, 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:325
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
+#: sm/gpgsm.c:204
+msgid "list external keys"
+msgstr "list external keys"
+
+#: sm/gpgsm.c:206
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
+#: sm/gpgsm.c:213
+msgid "import certificates"
+msgstr "import certificates"
+
+#: sm/gpgsm.c:214
+msgid "export certificates"
+msgstr "export certificates"
+
+#: sm/gpgsm.c:222
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
+#: sm/gpgsm.c:225
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
+#: sm/gpgsm.c:227
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
+#: sm/gpgsm.c:243
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:248
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
+#: sm/gpgsm.c:250
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
+#: sm/gpgsm.c:252
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
+#: sm/gpgsm.c:259
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
+#: sm/gpgsm.c:269
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
+#: sm/gpgsm.c:274
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
+#: sm/gpgsm.c:277
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:280
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
+#: sm/gpgsm.c:284
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:295
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: sm/gpgsm.c:297
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
+#: sm/gpgsm.c:302
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
+#: sm/gpgsm.c:305
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
+#: sm/gpgsm.c:306
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
+#: sm/gpgsm.c:307
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
+#: sm/gpgsm.c:310
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
+#: sm/gpgsm.c:313
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
+#: sm/gpgsm.c:323 tools/gpgconf-comp.c:789
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: sm/gpgsm.c:341
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
+#: sm/gpgsm.c:343
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
+#: sm/gpgsm.c:559
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
+#: sm/gpgsm.c:562
+msgid ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+msgstr ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+
+#: sm/gpgsm.c:766
+#, c-format
+msgid "Note: won't be able to encrypt to '%s': %s\n"
+msgstr "Note: won't be able to encrypt to '%s': %s\n"
+
+#: sm/gpgsm.c:777
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘[1m%s[0m’\n"
+
+#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%s:%u: no hostname given\n"
+
+#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: password given without user\n"
+
+#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
+#: sm/gpgsm.c:1420
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
+#: sm/gpgsm.c:1614
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘[1m%s[0m’\n"
+
+#: sm/gpgsm.c:1655
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
+#: sm/gpgsm.c:2011
+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:1225 sm/keydb.c:1319
+#, 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:1434
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
+#: sm/keydb.c:1102 sm/keydb.c:1188
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/keydb.c:1144
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
+#: sm/keydb.c:1156
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
+#: sm/keydb.c:1164
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
+#: sm/keydb.c:1216
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
+#: sm/keydb.c:1237 sm/keydb.c:1330
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
+#: sm/keylist.c:658
+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
+#, c-format
+msgid "can't parse certificate '%s': %s\n"
+msgstr "can't parse certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:398
+#, c-format
+msgid "certificate '%s' already cached\n"
+msgstr "certificate ‘[1m%s[0m’ already cached\n"
+
+#: dirmngr/certcache.c:402
+#, c-format
+msgid "trusted certificate '%s' loaded\n"
+msgstr "trusted certificate ‘[1m%s[0m’ loaded\n"
+
+#: dirmngr/certcache.c:404
+#, c-format
+msgid "certificate '%s' loaded\n"
+msgstr "certificate ‘[1m%s[0m’ loaded\n"
+
+#: dirmngr/certcache.c:408
+#, c-format
+msgid " SHA1 fingerprint = %s\n"
+msgstr " SHA1 fingerprint = %s\n"
+
+#: dirmngr/certcache.c:411
+msgid " issuer ="
+msgstr " issuer ="
+
+#: dirmngr/certcache.c:412
+msgid " subject ="
+msgstr " subject ="
+
+#: dirmngr/certcache.c:416
+#, c-format
+msgid "error loading certificate '%s': %s\n"
+msgstr "error loading certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:492
+#, c-format
+msgid "permanently loaded certificates: %u\n"
+msgstr "permanently loaded certificates: %u\n"
+
+#: dirmngr/certcache.c:494
+#, c-format
+msgid " runtime cached certificates: %u\n"
+msgstr " runtime cached certificates: %u\n"
+
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
+msgid "certificate already cached\n"
+msgstr "certificate already cached\n"
+
+#: dirmngr/certcache.c:511
+msgid "certificate cached\n"
+msgstr "certificate cached\n"
+
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
+#, c-format
+msgid "error caching certificate: %s\n"
+msgstr "error caching certificate: %s\n"
+
+#: dirmngr/certcache.c:596
+#, 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
+#, 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
+#, 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
+msgid "no issuer found in certificate\n"
+msgstr "no issuer found in certificate\n"
+
+#: dirmngr/certcache.c:1328
+#, 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:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
+#, 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:1356
+#, 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:1359
+#, 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:1370
+#, 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:1378
+#, c-format
+msgid "error getting data from cache file: %s\n"
+msgstr "error getting data from cache file: %s\n"
+
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "unknown hash algorithm ‘[1m%s[0m’\n"
+
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
+#, 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:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
+msgid "got an invalid S-expression from libksba\n"
+msgstr "got an invalid S-expression from libksba\n"
+
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
+#, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "converting S-expression failed: %s\n"
+
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
+#, c-format
+msgid "creating S-expression failed: %s\n"
+msgstr "creating S-expression failed: %s\n"
+
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
+#, c-format
+msgid "ksba_crl_parse failed: %s\n"
+msgstr "ksba_crl_parse failed: %s\n"
+
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
+#, c-format
+msgid "error getting update times of CRL: %s\n"
+msgstr "error getting update times of CRL: %s\n"
+
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
+#, 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:1722
++#: dirmngr/crlcache.c:1724
+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:1742
++#: dirmngr/crlcache.c:1744
+#, c-format
+msgid "error getting CRL item: %s\n"
+msgstr "error getting CRL item: %s\n"
+
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
+#, 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:1784
++#: dirmngr/crlcache.c:1786
+#, c-format
+msgid "no CRL issuer found in CRL: %s\n"
+msgstr "no CRL issuer found in CRL: %s\n"
+
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
+msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
+msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
+
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
+#, c-format
+msgid "CRL signature verification failed: %s\n"
+msgstr "CRL signature verification failed: %s\n"
+
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
+#, 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:1998
++#: dirmngr/crlcache.c:2000
+#, c-format
+msgid "ksba_crl_new failed: %s\n"
+msgstr "ksba_crl_new failed: %s\n"
+
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
+#, c-format
+msgid "ksba_crl_set_reader failed: %s\n"
+msgstr "ksba_crl_set_reader failed: %s\n"
+
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
+#, c-format
+msgid "removed stale temporary cache file '%s'\n"
+msgstr "removed stale temporary cache file ‘[1m%s[0m’\n"
+
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
+#, 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:2053
++#: dirmngr/crlcache.c:2055
+#, c-format
+msgid "error creating temporary cache file '%s': %s\n"
+msgstr "error creating temporary cache file '%s': %s\n"
+
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
+#, c-format
+msgid "crl_parse_insert failed: %s\n"
+msgstr "crl_parse_insert failed: %s\n"
+
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
+#, c-format
+msgid "error finishing temporary cache file '%s': %s\n"
+msgstr "error finishing temporary cache file '%s': %s\n"
+
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
+#, c-format
+msgid "error closing temporary cache file '%s': %s\n"
+msgstr "error closing temporary cache file '%s': %s\n"
+
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
+#, 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:2109
++#: dirmngr/crlcache.c:2111
+#, 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:2125
++#: dirmngr/crlcache.c:2127
+#, c-format
+msgid "unknown critical CRL extension %s\n"
+msgstr "unknown critical CRL extension %s\n"
+
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
+#, c-format
+msgid "error reading CRL extensions: %s\n"
+msgstr "error reading CRL extensions: %s\n"
+
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
+#, c-format
+msgid "creating cache file '%s'\n"
+msgstr "creating cache file ‘[1m%s[0m’\n"
+
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
+#, c-format
+msgid "problem renaming '%s' to '%s': %s\n"
+msgstr "problem renaming ‘[1m%s[0m’ to '%s': %s\n"
+
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
+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:2269
++#: dirmngr/crlcache.c:2271
+#, c-format
+msgid "Begin CRL dump (retrieved via %s)\n"
+msgstr "Begin CRL dump (retrieved via %s)\n"
+
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
+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:2295
++#: dirmngr/crlcache.c:2297
+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:2298
++#: dirmngr/crlcache.c:2300
+msgid " ERROR: The CRL will not be used\n"
+msgstr " ERROR: The CRL will not be used\n"
+
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
+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:2323
++#: dirmngr/crlcache.c:2325
+msgid " WARNING: invalid cache record length\n"
+msgstr " WARNING: invalid cache record length\n"
+
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
+#, c-format
+msgid "problem reading cache record: %s\n"
+msgstr "problem reading cache record: %s\n"
+
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
+#, c-format
+msgid "problem reading cache key: %s\n"
+msgstr "problem reading cache key: %s\n"
+
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
+#, c-format
+msgid "error reading cache entry from db: %s\n"
+msgstr "error reading cache entry from db: %s\n"
+
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
+msgid "End CRL dump\n"
+msgstr "End CRL dump\n"
+
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
+#, c-format
+msgid "crl_fetch via DP failed: %s\n"
+msgstr "crl_fetch via DP failed: %s\n"
+
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
+#, c-format
+msgid "crl_cache_insert via DP failed: %s\n"
+msgstr "crl_cache_insert via DP failed: %s\n"
+
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
+#, 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:557
+#, 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"
++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:70
++#: dirmngr/dirmngr-client.c:71
+msgid "use OCSP instead of CRLs"
+msgstr "use OCSP instead of CRLs"
+
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
+msgid "check whether a dirmngr is running"
+msgstr "check whether a dirmngr is running"
+
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
+msgid "add a certificate to the cache"
+msgstr "add a certificate to the cache"
+
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
+msgid "validate a certificate"
+msgstr "validate a certificate"
+
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
+msgid "lookup a certificate"
+msgstr "lookup a certificate"
+
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
+msgid "lookup only locally stored certificates"
+msgstr "lookup only locally stored certificates"
+
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
+msgid "expect an URL for --lookup"
+msgstr "expect an URL for --lookup"
+
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
+msgid "load a CRL into the dirmngr"
+msgstr "load a CRL into the dirmngr"
+
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
+msgid "special mode for use by Squid"
+msgstr "special mode for use by Squid"
+
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
+msgid "expect certificates in PEM format"
+msgstr "expect certificates in PEM format"
+
- #: dirmngr/dirmngr-client.c:81
++#: 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:151
++#: dirmngr/dirmngr-client.c:150
+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:155
++#: dirmngr/dirmngr-client.c:154
+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:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
+#, c-format
+msgid "error reading certificate from stdin: %s\n"
+msgstr "error reading certificate from stdin: %s\n"
+
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
+#, c-format
+msgid "error reading certificate from '%s': %s\n"
+msgstr "error reading certificate from '%s': %s\n"
+
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
+msgid "certificate too large to make any sense\n"
+msgstr "certificate too large to make any sense\n"
+
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
++#, c-format
++msgid "can't connect to the dirmngr: %s\n"
++msgstr "can't connect to the dirmngr: %s\n"
++
++#: dirmngr/dirmngr-client.c:327
+#, c-format
+msgid "lookup failed: %s\n"
+msgstr "lookup failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
+#, c-format
+msgid "loading CRL '%s' failed: %s\n"
+msgstr "loading CRL ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
+msgid "a dirmngr daemon is up and running\n"
+msgstr "a dirmngr daemon is up and running\n"
+
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
+#, c-format
+msgid "validation of certificate failed: %s\n"
+msgstr "validation of certificate failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
+msgid "certificate is valid\n"
+msgstr "certificate is valid\n"
+
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
+msgid "certificate has been revoked\n"
+msgstr "certificate has been revoked\n"
+
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
+#, c-format
+msgid "certificate check failed: %s\n"
+msgstr "certificate check failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
+#, c-format
+msgid "got status: '%s'\n"
+msgstr "got status: ‘[1m%s[0m’\n"
+
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
+#, c-format
+msgid "error writing base64 encoding: %s\n"
+msgstr "error writing base64 encoding: %s\n"
+
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "failed to allocate assuan context: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr "apparently no running dirmngr\n"
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr "no running dirmngr - starting one\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr "malformed %s environment variable\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "dirmngr protocol version %d is not supported\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "can't connect to the dirmngr - trying fall back\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "can't connect to the dirmngr: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
+#, c-format
+msgid "unsupported inquiry '%s'\n"
+msgstr "unsupported inquiry ‘[1m%s[0m’\n"
+
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
+msgid "absolute file name expected\n"
+msgstr "absolute file name expected\n"
+
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
+#, c-format
+msgid "looking up '%s'\n"
+msgstr "looking up ‘[1m%s[0m’\n"
+
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
+msgid "run as windows service (background)"
+msgstr "run as windows service (background)"
+
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
+msgid "flush the cache"
+msgstr "flush the cache"
+
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
+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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
+msgid "|N|set LDAP timeout to N seconds"
+msgstr "|N|set LDAP timeout to N seconds"
+
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
+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:219
++#: dirmngr/dirmngr.c:222
+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:221
- msgid "route all network traffic via TOR"
- msgstr "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
++msgid "route all network traffic via Tor"
++msgstr "route all network traffic via Tor"
+
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
+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:350
++#: dirmngr/dirmngr.c:353
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
+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:432
++#: dirmngr/dirmngr.c:435
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
+#, 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:1794
++#: dirmngr/dirmngr.c:1804
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
+#, 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:664
+#, 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:646
+#, c-format
+msgid "binding to '%s:%d' failed: %s\n"
+msgstr "binding to ‘[1m%s:%d[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:673
+#, c-format
+msgid "searching '%s' failed: %s\n"
+msgstr "searching ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:705
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘[1m%s[0m’ is not an LDAP URL\n"
+
+#: dirmngr/dirmngr_ldap.c:711
+#, 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:496
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
- #: dirmngr/ldap.c:603
++#: 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:809
++#: 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:164
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: dirmngr/misc.c:188 dirmngr/misc.c:222
+#, c-format
+msgid "gcry_md_open failed: %s\n"
+msgstr "gcry_md_open failed: %s\n"
+
+#: dirmngr/misc.c:193 dirmngr/misc.c:227
+#, c-format
+msgid "oops: ksba_cert_hash failed: %s\n"
+msgstr "oops: ksba_cert_hash failed: %s\n"
+
+#: dirmngr/misc.c:512
+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"
++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
+msgid "only SHA-1 is supported for OCSP responses\n"
+msgstr "only SHA-1 is supported for OCSP responses\n"
+
+#: dirmngr/ocsp.c:468
+#, c-format
+msgid "allocating list item failed: %s\n"
+msgstr "allocating list item failed: %s\n"
+
+#: dirmngr/ocsp.c:483
+#, c-format
+msgid "error getting responder ID: %s\n"
+msgstr "error getting responder ID: %s\n"
+
+#: dirmngr/ocsp.c:518
+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
+#, c-format
+msgid "issuer certificate not found: %s\n"
+msgstr "issuer certificate not found: %s\n"
+
+#: dirmngr/ocsp.c:567
+msgid "caller did not return the target certificate\n"
+msgstr "caller did not return the target certificate\n"
+
+#: dirmngr/ocsp.c:574
+msgid "caller did not return the issuing certificate\n"
+msgstr "caller did not return the issuing certificate\n"
+
+#: dirmngr/ocsp.c:584
+#, c-format
+msgid "failed to allocate OCSP context: %s\n"
+msgstr "failed to allocate OCSP context: %s\n"
+
+#: dirmngr/ocsp.c:618
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "can't get authorityInfoAccess: %s\n"
+
+#: dirmngr/ocsp.c:625
+msgid "no default OCSP responder defined\n"
+msgstr "no default OCSP responder defined\n"
+
+#: dirmngr/ocsp.c:631
+msgid "no default OCSP signer defined\n"
+msgstr "no default OCSP signer defined\n"
+
+#: dirmngr/ocsp.c:638
+#, c-format
+msgid "using default OCSP responder '%s'\n"
+msgstr "using default OCSP responder ‘[1m%s[0m’\n"
+
+#: dirmngr/ocsp.c:643
+#, c-format
+msgid "using OCSP responder '%s'\n"
+msgstr "using OCSP responder ‘[1m%s[0m’\n"
+
+#: dirmngr/ocsp.c:650
+#, 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
+#, 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
+#, 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
+msgid "good"
+msgstr "good"
+
+#: dirmngr/ocsp.c:712
+#, 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
+msgid "OCSP responder returned a status in the future\n"
+msgstr "OCSP responder returned a status in the future\n"
+
+#: dirmngr/ocsp.c:759
+msgid "OCSP responder returned a non-current status\n"
+msgstr "OCSP responder returned a non-current status\n"
+
+#: dirmngr/ocsp.c:774
+msgid "OCSP responder returned an too old status\n"
+msgstr "OCSP responder returned an too old status\n"
+
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
++#, c-format
++msgid "failed to allocate assuan context: %s\n"
++msgstr "failed to allocate assuan context: %s\n"
++
++#: dirmngr/server.c:2430
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
+#, 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:2352
++#: dirmngr/server.c:2478
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
+#, 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
+msgid "selfsigned certificate has a BAD signature"
+msgstr "selfsigned certificate has a BAD signature"
+
+#: dirmngr/validate.c:565
+#, c-format
+msgid "checking trustworthiness of root certificate failed: %s\n"
+msgstr "checking trustworthiness of root certificate failed: %s\n"
+
+#: dirmngr/validate.c:742
+msgid "certificate chain is good\n"
+msgstr "certificate chain is good\n"
+
+#: dirmngr/validate.c:972
+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
+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:86 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:1248
+#, 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:1259 tools/gpg-connect-agent.c:1265
+#: tools/gpg-connect-agent.c:1271
+#, 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:1369 tools/gpg-connect-agent.c:1864
+#, c-format
+msgid "receiving line failed: %s\n"
+msgstr "receiving line failed: %s\n"
+
+#: tools/gpg-connect-agent.c:1459
+msgid "line too long - skipped\n"
+msgstr "line too long - skipped\n"
+
+#: tools/gpg-connect-agent.c:1463
+msgid "line shortened due to embedded Nul character\n"
+msgstr "line shortened due to embedded Nul character\n"
+
+#: tools/gpg-connect-agent.c:1838
+#, c-format
+msgid "unknown command '%s'\n"
+msgstr "unknown command ‘[1m%s[0m’\n"
+
+#: tools/gpg-connect-agent.c:1856
+#, c-format
+msgid "sending line failed: %s\n"
+msgstr "sending line failed: %s\n"
+
+#: tools/gpg-connect-agent.c:2244
+#, 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:604 tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:756 tools/gpgconf-comp.c:852
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:769 tools/gpgconf-comp.c:875
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:646 tools/gpgconf-comp.c:713
+#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:882
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:811
+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"
+
+#: 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:694 tools/gpgconf-comp.c:771
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:697 tools/gpgconf-comp.c:774
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:700
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:918
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:728 tools/gpgconf-comp.c:920
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:731
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:734
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:783
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:786
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:816
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:865
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:901
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
- msgstr "Options controlling the use of TOR"
++msgid "Options controlling the use of Tor"
++msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:925
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:936
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:941
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:970
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:978
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1059
+msgid "GPG for OpenPGP"
+msgstr "GPG for OpenPGP"
+
+#: tools/gpgconf-comp.c:1060
+msgid "GPG Agent"
+msgstr "GPG Agent"
+
+#: tools/gpgconf-comp.c:1061
+msgid "Smartcard Daemon"
+msgstr "Smartcard Daemon"
+
+#: tools/gpgconf-comp.c:1062
+msgid "GPG for S/MIME"
+msgstr "GPG for S/MIME"
+
+#: tools/gpgconf-comp.c:1063
+msgid "Key Acquirer"
+msgstr "Key Acquirer"
+
+#: tools/gpgconf-comp.c:1064
+msgid "PIN and Passphrase Entry"
+msgstr "PIN and Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1178
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3236
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3387
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
+#: tools/gpgconf.c:65
+msgid "list all components"
+msgstr "list all components"
+
+#: tools/gpgconf.c:66
+msgid "check all programs"
+msgstr "check all programs"
+
+#: tools/gpgconf.c:67
+msgid "|COMPONENT|list options"
+msgstr "|COMPONENT|list options"
+
+#: tools/gpgconf.c:68
+msgid "|COMPONENT|change options"
+msgstr "|COMPONENT|change options"
+
+#: tools/gpgconf.c:69
+msgid "|COMPONENT|check options"
+msgstr "|COMPONENT|check options"
+
+#: tools/gpgconf.c:71
+msgid "apply global default values"
+msgstr "apply global default values"
+
+#: tools/gpgconf.c:73
+msgid "get the configuration directories for @GPGCONF@"
+msgstr "get the configuration directories for @GPGCONF@"
+
+#: tools/gpgconf.c:75
+msgid "list global configuration file"
+msgstr "list global configuration file"
+
+#: tools/gpgconf.c:77
+msgid "check global configuration file"
+msgstr "check global configuration file"
+
+#: tools/gpgconf.c:78
+msgid "reload all or a given component"
+msgstr "reload all or a given component"
+
+#: tools/gpgconf.c:79
+msgid "launch a given component"
+msgstr "launch a given component"
+
+#: tools/gpgconf.c:80
+msgid "kill a given component"
+msgstr "kill a given component"
+
+#: tools/gpgconf.c:84
+msgid "use as output file"
+msgstr "use as output file"
+
+#: tools/gpgconf.c:88
+msgid "activate changes at runtime, if possible"
+msgstr "activate changes at runtime, if possible"
+
+#: tools/gpgconf.c:110
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
+#: tools/gpgconf.c:113
+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:234 tools/gpgconf.c:268
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
+#: tools/gpgconf.c:243 tools/gpgconf.c:280 tools/gpgconf.c:313
+msgid "Component not found"
+msgstr "Component not found"
+
+#: tools/gpgconf.c:339
+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
+#, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s on %s aborted with status %i\n"
+
+#: tools/symcryptrun.c:288
+#, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "%s on %s failed with status %i\n"
+
+#: tools/symcryptrun.c:320
+#, 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
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "could not open %s for writing: %s\n"
+
+#: tools/symcryptrun.c:388
+#, c-format
+msgid "error writing to %s: %s\n"
+msgstr "error writing to %s: %s\n"
+
+#: tools/symcryptrun.c:395
+#, c-format
+msgid "error reading from %s: %s\n"
+msgstr "error reading from %s: %s\n"
+
+#: tools/symcryptrun.c:402 tools/symcryptrun.c:409
+#, c-format
+msgid "error closing %s: %s\n"
+msgstr "error closing %s: %s\n"
+
+#: tools/symcryptrun.c:494
+msgid "no --program option provided\n"
+msgstr "no --program option provided\n"
+
+#: tools/symcryptrun.c:500
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr "only --decrypt and --encrypt are supported\n"
+
+#: tools/symcryptrun.c:506
+msgid "no --keyfile option provided\n"
+msgstr "no --keyfile option provided\n"
+
+#: tools/symcryptrun.c:517
+msgid "cannot allocate args vector\n"
+msgstr "cannot allocate args vector\n"
+
+#: tools/symcryptrun.c:535
+#, c-format
+msgid "could not create pipe: %s\n"
+msgstr "could not create pipe: %s\n"
+
+#: tools/symcryptrun.c:542
+#, c-format
+msgid "could not create pty: %s\n"
+msgstr "could not create pty: %s\n"
+
+#: tools/symcryptrun.c:558
+#, c-format
+msgid "could not fork: %s\n"
+msgstr "could not fork: %s\n"
+
+#: tools/symcryptrun.c:586
+#, c-format
+msgid "execv failed: %s\n"
+msgstr "execv failed: %s\n"
+
+#: tools/symcryptrun.c:615
+#, c-format
+msgid "select failed: %s\n"
+msgstr "select failed: %s\n"
+
+#: tools/symcryptrun.c:632
+#, c-format
+msgid "read failed: %s\n"
+msgstr "read failed: %s\n"
+
+#: tools/symcryptrun.c:684
+#, c-format
+msgid "pty read failed: %s\n"
+msgstr "pty read failed: %s\n"
+
+#: tools/symcryptrun.c:736
+#, c-format
+msgid "waitpid failed: %s\n"
+msgstr "waitpid failed: %s\n"
+
+#: tools/symcryptrun.c:750
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr "child aborted with status %i\n"
+
+#: tools/symcryptrun.c:805
+#, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "cannot allocate infile string: %s\n"
+
+#: tools/symcryptrun.c:818
+#, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "cannot allocate outfile string: %s\n"
+
+#: tools/symcryptrun.c:993
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr "either %s or %s must be given\n"
+
+#: tools/symcryptrun.c:1020
+msgid "no class provided\n"
+msgstr "no class provided\n"
+
+#: tools/symcryptrun.c:1029
+#, 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.gmo
index 7ca1281,0000000..02589cd
mode 100644,000000..100644
Binary files differ
diff --cc po/en at quot.po
index 9adcd56,0000000..cd6e83c
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10075 -1,0 +1,10197 @@@
+# English translations for GNU gnupg package.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU gnupg package.
+# Automatically generated, 2015.
+#
+# 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.9\n"
++"Project-Id-Version: GNU gnupg 2.1.10\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-10-09 17:17+0200\n"
- "PO-Revision-Date: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
++"PO-Revision-Date: 2015-12-04 10:57+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c: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:722
++#: agent/call-pinentry.c:724
+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:744
++#: agent/call-pinentry.c:746
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
+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:857
++#: agent/call-pinentry.c:859
+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:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+msgid "PIN:"
+msgstr "PIN:"
+
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
+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:945
++#: agent/call-pinentry.c:947
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
+msgid "Repeat:"
+msgstr "Repeat:"
+
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
+msgid "PIN too long"
+msgstr "PIN too long"
+
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
+msgid "PIN too short"
+msgstr "PIN too short"
+
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
+#: agent/command-ssh.c:604 agent/command-ssh.c:699
+#, 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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
+#: agent/command-ssh.c:2437 agent/command-ssh.c:2455
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
+#: agent/command-ssh.c:2441
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
+#: agent/command-ssh.c:2446
+#, 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:2466
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
+#: agent/command-ssh.c:2516
+#, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "shadowing the key failed: %s\n"
+
+#: agent/command-ssh.c:2531
+#, c-format
+msgid "error writing key: %s\n"
+msgstr "error writing key: %s\n"
+
+#: agent/command-ssh.c:2814
+#, 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:2821
+msgid "Allow"
+msgstr "Allow"
+
+#: agent/command-ssh.c:2821
+msgid "Deny"
+msgstr "Deny"
+
+#: agent/command-ssh.c:2830
+#, 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:3069 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
+#: agent/command-ssh.c:3094
+#, 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:3614
+#, 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:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
+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:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
+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:147 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
+msgid "verbose"
+msgstr "verbose"
+
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
+#: agent/gpg-agent.c:165
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
+#: agent/gpg-agent.c:166 tools/symcryptrun.c:168
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
+#: agent/gpg-agent.c:168
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
+#: agent/gpg-agent.c:172
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
+#: agent/gpg-agent.c:174
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
+#: agent/gpg-agent.c:178
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
+#: agent/gpg-agent.c:194
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
+#: agent/gpg-agent.c:196
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
+#: agent/gpg-agent.c:199
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
+#: agent/gpg-agent.c:213
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
+#: agent/gpg-agent.c:215
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
+#: agent/gpg-agent.c:217
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “trusted”"
+
+#: agent/gpg-agent.c:220
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
+#: agent/gpg-agent.c:222
+msgid "allow caller to override the pinentry"
+msgstr "allow caller to override the pinentry"
+
+#: agent/gpg-agent.c:224
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
+#: agent/gpg-agent.c:226
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: agent/gpg-agent.c:229
+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:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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:449
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
+#: agent/gpg-agent.c:451
+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:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘%s’ given\n"
+
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘%s’\n"
+
- #: agent/gpg-agent.c:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘%s’\n"
+
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
+#, c-format
+msgid "Note: '%s' is not considered an option\n"
+msgstr "Note: ‘%s’ is not considered an option\n"
+
- #: agent/gpg-agent.c:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘%s’ is too long\n"
+
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
+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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘%s’\n"
+
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘%s’ created\n"
+
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
+#, c-format
+msgid "can't use '%s' as home directory\n"
+msgstr "can't use ‘%s’ as home directory\n"
+
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
+#, 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:2288
++#: agent/gpg-agent.c:2273
+#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
+msgid "no gpg-agent running in this session\n"
+msgstr "no gpg-agent running in this session\n"
+
+#: agent/preset-passphrase.c:100
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: agent/protect-tool.c:151
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
+
+#: agent/protect-tool.c:153
+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:683
+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:688
+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:694
+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:699
+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:710 tools/symcryptrun.c:454
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
+#: agent/protect-tool.c:712 tools/symcryptrun.c:450
+#, 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:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
+#, 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:427 agent/trustlist.c:496
+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:654
+#, 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:663 common/audit.c:467
+msgid "Yes"
+msgstr "Yes"
+
+#: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
+#: 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:697
+#, 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:711
+msgid "Correct"
+msgstr "Correct"
+
+#: agent/trustlist.c:711
+msgid "Wrong"
+msgstr "Wrong"
+
+#: agent/findkey.c:137
+#, 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:153
+#, 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:167 agent/findkey.c:174
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
+#: agent/findkey.c:175
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
+#: agent/findkey.c:1266
+#, 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:1290 agent/findkey.c:1304
+msgid "Delete key"
+msgstr "Delete key"
+
+#: agent/findkey.c:1301
+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:285 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:324 common/exechelp-w32.c:391
+#: common/exechelp-w32.c:415 common/exechelp-w32.c:445
+#: 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:337 common/exechelp-w32.c:401
+#: common/exechelp-w32.c:425 common/exechelp-w32.c:455
+#, 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:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
+#, c-format
+msgid "error forking process: %s\n"
+msgstr "error forking process: %s\n"
+
+#: common/exechelp-posix.c:539 common/exechelp-w32.c:702
+#: common/exechelp-w32ce.c:751
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr "waiting for process %d to terminate failed: %s\n"
+
+#: common/exechelp-posix.c:548
+#, c-format
+msgid "error running '%s': probably not installed\n"
+msgstr "error running '%s': probably not installed\n"
+
+#: common/exechelp-posix.c:554 common/exechelp-w32.c:716
+#: common/exechelp-w32ce.c:765
+#, c-format
+msgid "error running '%s': exit status %d\n"
+msgstr "error running '%s': exit status %d\n"
+
+#: common/exechelp-posix.c:562
+#, c-format
+msgid "error running '%s': terminated\n"
+msgstr "error running '%s': terminated\n"
+
+#: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
+#, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "error getting exit code of process %d: %s\n"
+
+#: common/simple-pwquery.c:376
+#, c-format
+msgid "can't connect to '%s': %s\n"
+msgstr "can't connect to '%s': %s\n"
+
+#: common/simple-pwquery.c:387
+msgid "communication problem with gpg-agent\n"
+msgstr "communication problem with gpg-agent\n"
+
+#: common/simple-pwquery.c:397
+msgid "problem setting the gpg-agent options\n"
+msgstr "problem setting the gpg-agent options\n"
+
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+msgid "canceled by user\n"
+msgstr "canceled by user\n"
+
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+msgid "problem with the agent\n"
+msgstr "problem with the agent\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:35 common/yesno.c:72
+msgid "yes"
+msgstr "yes"
+
+#: common/yesno.c:36 common/yesno.c:77
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:38 common/yesno.c:74
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:39 common/yesno.c:78
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:76
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:79
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:115
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:116
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:117
+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:132
+#, 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:135
+#, 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:479
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr "unknown debug flag ‘%s’ ignored\n"
+
+#: common/asshelp.c:410
+#, c-format
+msgid "no running gpg-agent - starting '%s'\n"
+msgstr "no running gpg-agent - starting ‘%s’\n"
+
+#: common/asshelp.c:470
+#, 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:478 common/asshelp.c:501
++#: common/asshelp.c:478
+msgid "connection to agent established\n"
+msgstr "connection to agent established\n"
+
+#: common/asshelp.c:518
+msgid "connection to agent is in restricted mode\n"
+msgstr "connection to agent is in restricted mode\n"
+
+#: common/asshelp.c:600
+#, c-format
+msgid "no running Dirmngr - starting '%s'\n"
+msgstr "no running Dirmngr - starting ‘%s’\n"
+
+#: common/asshelp.c:657
+#, 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:666 common/asshelp.c:697
++#: common/asshelp.c:666
+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:2882
+#, 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:989
+msgid "no CRL found for certificate"
+msgstr "no CRL found for certificate"
+
+#: common/audit.c:1114 sm/certchain.c:999
+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:860
+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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
+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/logging.c:933
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "you found a bug ... (%s:%d)\n"
+
+#: common/utf8conv.c:116
+#, c-format
+msgid "conversion from '%s' to '%s' not available\n"
+msgstr "conversion from ‘%s’ to ‘%s’ not available\n"
+
+#: common/utf8conv.c:124
+#, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "iconv_open failed: %s\n"
+
+#: common/utf8conv.c:378 common/utf8conv.c:644
+#, c-format
+msgid "conversion from '%s' to '%s' failed: %s\n"
+msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
+
+#: common/dotlock.c:669
+#, c-format
+msgid "failed to create temporary file '%s': %s\n"
+msgstr "failed to create temporary file '%s': %s\n"
+
+#: common/dotlock.c:724
+#, c-format
+msgid "error writing to '%s': %s\n"
+msgstr "error writing to '%s': %s\n"
+
+#: common/dotlock.c:1056
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr "removing stale lockfile (created by %d)\n"
+
+#: common/dotlock.c:1092
+#, 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:1093
+msgid "(deadlock?) "
+msgstr "(deadlock?) "
+
+#: common/dotlock.c:1132
+#, c-format
+msgid "lock '%s' not made: %s\n"
+msgstr "lock ‘%s’ not made: %s\n"
+
+#: common/dotlock.c:1158
+#, c-format
+msgid "waiting for lock %s...\n"
+msgstr "waiting for lock %s...\n"
+
+#: g10/armor.c:377
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
+#: g10/armor.c:416
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
+#: g10/armor.c:427
+msgid "armor header: "
+msgstr "armor header: "
+
+#: g10/armor.c:440
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
+#: g10/armor.c:453
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
+#: g10/armor.c:506
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
+#: g10/armor.c:641
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
+#: g10/armor.c:654
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
+#: g10/armor.c:808 g10/armor.c:1424
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
+#: g10/armor.c:851
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
+#: g10/armor.c:885
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
+#: g10/armor.c:893
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
+#: g10/armor.c:897 g10/armor.c:1461
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
+#: g10/armor.c:917
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:921
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
+#: g10/armor.c:1238
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
+#: g10/armor.c:1243
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
+#: g10/armor.c:1247
+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:985
+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:997
+msgid "a user notation name must contain the '@' character\n"
+msgstr "a user notation name must contain the ‘@’ character\n"
+
+#: g10/build-packet.c:1003
+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:1021
+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:1055 g10/build-packet.c:1064
+msgid "WARNING: invalid notation data found\n"
+msgstr "WARNING: invalid notation data found\n"
+
+#: g10/build-packet.c:1086 g10/build-packet.c:1088
+msgid "not human readable"
+msgstr "not human readable"
+
+#: g10/call-agent.c:164 sm/call-agent.c:155
+#, c-format
+msgid "failed to proxy %s inquiry to client\n"
+msgstr "failed to proxy %s inquiry to client\n"
+
+#: g10/call-agent.c:189
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
+#, c-format
+msgid "OpenPGP card not available: %s\n"
+msgstr "OpenPGP card not available: %s\n"
+
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
+#, c-format
+msgid "OpenPGP card no. %s detected\n"
+msgstr "OpenPGP card no. %s detected\n"
+
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
+msgid "can't do this in batch mode\n"
+msgstr "can't do this in batch mode\n"
+
+#: g10/card-util.c:108
+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:110 scd/app-openpgp.c:2256
+msgid "Reset Code not or not anymore available\n"
+msgstr "Reset Code not or not anymore available\n"
+
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 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
++#: g10/card-util.c:280 g10/card-util.c:331
+msgid "[not set]"
+msgstr "[not set]"
+
- #: g10/card-util.c:528
++#: g10/card-util.c:534
+msgid "male"
+msgstr "male"
+
- #: g10/card-util.c:529
++#: g10/card-util.c:535
+msgid "female"
+msgstr "female"
+
- #: g10/card-util.c:529
++#: g10/card-util.c:535
+msgid "unspecified"
+msgstr "unspecified"
+
- #: g10/card-util.c:556
++#: g10/card-util.c:562
+msgid "not forced"
+msgstr "not forced"
+
- #: g10/card-util.c:556
++#: g10/card-util.c:562
+msgid "forced"
+msgstr "forced"
+
- #: g10/card-util.c:631
++#: g10/card-util.c:637
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
- #: g10/card-util.c:633
++#: g10/card-util.c:639
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “<” character may not be used.\n"
+
- #: g10/card-util.c:635
++#: g10/card-util.c:641
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
- #: g10/card-util.c:652
++#: g10/card-util.c:658
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
- #: g10/card-util.c:654
++#: g10/card-util.c:660
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
- #: g10/card-util.c:672
++#: g10/card-util.c:678
+#, 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:693
++#: g10/card-util.c:699
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
- #: g10/card-util.c:701
++#: g10/card-util.c:707
+#, 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:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error allocating enough memory: %s\n"
+
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
+#, c-format
+msgid "error reading '%s': %s\n"
+msgstr "error reading '%s': %s\n"
+
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
- #: g10/card-util.c:866
++#: g10/card-util.c:872
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
- #: g10/card-util.c:876
++#: g10/card-util.c:882
+#, c-format
+msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "Error: Login data too long (limit is %d characters).\n"
+
- #: g10/card-util.c:912
++#: g10/card-util.c:918
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
- #: g10/card-util.c:922
++#: g10/card-util.c:928
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "Error: Private DO too long (limit is %d characters).\n"
+
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
+msgid ""
+"Note: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+"Note: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
+
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
+#, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "What keysize do you want for the Signature key? (%u) "
+
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
+#, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "What keysize do you want for the Encryption key? (%u) "
+
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
+#, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "What keysize do you want for the Authentication key? (%u) "
+
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: 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:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 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:1323
++#: g10/card-util.c:1329
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr "The card will now be re-configured to generate a key of %u bits\n"
+
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
+#, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "error changing size of key %d to %u bits: %s\n"
+
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
+#, c-format
+msgid ""
+"Please note that the factory settings of the PINs are\n"
+" PIN = '%s' Admin PIN = '%s'\n"
+"You should change them using the command --change-pin\n"
+msgstr ""
+"Please note that the factory settings of the PINs are\n"
+" PIN = ‘%s’ Admin PIN = ‘%s’\n"
+"You should change them using the command --change-pin\n"
+
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
+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:1713
++#: g10/card-util.c:1719
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “yes”) "
+
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
+msgid "quit this menu"
+msgstr "quit this menu"
+
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
+msgid "show admin commands"
+msgstr "show admin commands"
+
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
+msgid "show this help"
+msgstr "show this help"
+
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
+msgid "list all available data"
+msgstr "list all available data"
+
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
+msgid "change the login name"
+msgstr "change the login name"
+
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
+msgid "generate new keys"
+msgstr "generate new keys"
+
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “help”)\n"
+
+#: g10/decrypt.c:192 g10/encrypt.c:939
+msgid "--output doesn't work for this command\n"
+msgstr "--output doesn't work for this command\n"
+
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘%s’\n"
+
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “%s” not found: %s\n"
+
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
++#, c-format
++msgid "key \"%s\" not found\n"
++msgstr "key “%s” not found\n"
++
++#: g10/delkey.c:130 g10/delkey.c:137
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(unless you specify the key by fingerprint)\n"
+
- #: g10/delkey.c:134
++#: g10/delkey.c:136
+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:147
++#: g10/delkey.c:149
+msgid "Delete this key from the keyring? (y/N) "
+msgstr "Delete this key from the keyring? (y/N) "
+
- #: g10/delkey.c:157
++#: g10/delkey.c:159
+msgid "This is a secret key! - really delete? (y/N) "
+msgstr "This is a secret key! - really delete? (y/N) "
+
- #: g10/delkey.c:194
++#: g10/delkey.c:196
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
- #: g10/delkey.c:196
++#: g10/delkey.c:198
+msgid "key"
+msgstr "key"
+
- #: g10/delkey.c:196
++#: g10/delkey.c:198
+msgid "subkey"
+msgstr "subkey"
+
- #: g10/delkey.c:216
++#: g10/delkey.c:218
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
- #: g10/delkey.c:229
++#: g10/delkey.c:231
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
- #: g10/delkey.c:265
++#: g10/delkey.c:267
+#, 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:267
++#: g10/delkey.c:269
+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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: g10/encrypt.c:233
+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:247
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encrypt.c:257 g10/encrypt.c:617
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘%s’ already compressed\n"
+
+#: g10/encrypt.c:314 g10/encrypt.c:653 g10/sign.c:580
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘%s’ is an empty file\n"
+
+#: g10/encrypt.c:550
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘%s’\n"
+
+#: g10/encrypt.c:598
+#, 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:700 g10/sign.c:954
+#, 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:810
+#, 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:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
+#, 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/encrypt.c:909
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “%s”\n"
+
+#: g10/decrypt-data.c:94 g10/mainproc.c:307
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
+#: g10/decrypt-data.c:97 g10/mainproc.c:311
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "encrypted with unknown algorithm %d\n"
+
+#: g10/decrypt-data.c:165 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:177
+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:63
++#: g10/export.c:77
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
- #: g10/export.c:65
++#: g10/export.c:79
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
- #: g10/export.c:67
++#: g10/export.c:81
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “sensitive”"
+
- #: g10/export.c:69
++#: g10/export.c:83
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
- #: g10/export.c:71
++#: g10/export.c:85
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
- #: g10/export.c:814
++#: g10/export.c:902
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:895
++#: g10/export.c:980
+#, 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:1081
++#: g10/export.c:1167
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
- #: g10/export.c:1179
++#: g10/export.c:1275
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1235
++#: g10/export.c:1337
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/getkey.c:230
++#: g10/getkey.c:234
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘%s’ via %s\n"
+
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘%s’ via %s: %s\n"
+
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
++#, c-format
++msgid "secret key \"%s\" not found: %s\n"
++msgstr "secret key “%s” not found: %s\n"
++
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
++#, c-format
++msgid "(check argument of option '%s')\n"
++msgstr "(check argument of option '%s')\n"
++
++#: g10/getkey.c:1216
++#, c-format
++msgid "using \"%s\" as default secret key\n"
++msgstr "using “%s” as default secret key\n"
++
++#: g10/getkey.c:1890
+#, 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:2588
++#: g10/getkey.c:2701
+#, 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:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:398
++#: g10/gpg.c:406
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:402
++#: g10/gpg.c:410
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:410
++#: g10/gpg.c:418
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:411
++#: g10/gpg.c:419
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:417
++#: g10/gpg.c:425
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:419
++#: g10/gpg.c:427
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:421
++#: g10/gpg.c:429
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:422
++#: g10/gpg.c:430
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:426
++#: g10/gpg.c:434
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:428
++#: g10/gpg.c:436
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:430
++#: g10/gpg.c:438
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:431
++#: g10/gpg.c:439
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:432
++#: g10/gpg.c:440
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:433
++#: g10/gpg.c:441
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:437
++#: g10/gpg.c:445
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:438
++#: g10/gpg.c:446
+msgid "export keys to a key server"
+msgstr "export keys to a key server"
+
- #: g10/gpg.c:439
++#: g10/gpg.c:447
+msgid "import keys from a key server"
+msgstr "import keys from a key server"
+
- #: g10/gpg.c:441
++#: g10/gpg.c:449
+msgid "search for keys on a key server"
+msgstr "search for keys on a key server"
+
- #: g10/gpg.c:443
++#: g10/gpg.c:451
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:448
++#: g10/gpg.c:456
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:451
++#: g10/gpg.c:459
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:452
++#: g10/gpg.c:460
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:453
++#: g10/gpg.c:461
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:465
++#: g10/gpg.c:473
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:474
++#: g10/gpg.c:482
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
++msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
++msgstr "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
++
++#: g10/gpg.c:491 sm/gpgsm.c:241
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
- #: g10/gpg.c:502
++#: g10/gpg.c:513
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:508
++#: g10/gpg.c:519
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
- #: g10/gpg.c:538
++#: g10/gpg.c:549
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:583
++#: g10/gpg.c:594
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
+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:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
+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:967
++#: g10/gpg.c:983
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:970
++#: g10/gpg.c:986
+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:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
+#, c-format
+msgid "no = sign found in group definition '%s'\n"
+msgstr "no = sign found in group definition ‘%s’\n"
+
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
+
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file '%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
+
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
+
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file '%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
+
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
+#, 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:1516
++#: g10/gpg.c:1532
+#, 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:1519
++#: g10/gpg.c:1535
+#, 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:1525
++#: g10/gpg.c:1541
+#, 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:1528
++#: g10/gpg.c:1544
+#, 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:1531
++#: g10/gpg.c:1547
+#, 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:1738
++#: g10/gpg.c:1754
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
+
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
++msgid "available TOFU policies:\n"
++msgstr "available TOFU policies:\n"
++
++#: g10/gpg.c:1998
++#, c-format
++msgid "unknown TOFU policy '%s'\n"
++msgstr "unknown TOFU policy ‘%s’\n"
++
++#: g10/gpg.c:2000 g10/gpg.c:2024
++msgid "(use \"help\" to list choices)\n"
++msgstr "(use “help” to list choices)\n"
++
++#: g10/gpg.c:2022
++#, c-format
++msgid "unknown TOFU DB format '%s'\n"
++msgstr "unknown TOFU DB format ‘%s’\n"
++
++#: g10/gpg.c:2085
+#, c-format
+msgid "Note: old default options file '%s' ignored\n"
+msgstr "Note: old default options file ‘%s’ ignored\n"
+
- #: g10/gpg.c:2100
++#: g10/gpg.c:2188
++#, c-format
++msgid ""
++"Warning: value '%s' for option '%s' should be a long key ID or a "
++"fingerprint\n"
++msgstr ""
++"Warning: value ‘%s’ for option ‘%s’ should be a long key ID or a "
++"fingerprint\n"
++
++#: g10/gpg.c:2299
++#, c-format
++msgid "key specification '%s' is ambiguous\n"
++msgstr "key specification ‘%s’ is ambiguous\n"
++
++#. TRANSLATORS: The %s prints a key specification which
++#. for example has been given at the command line. Two
++#. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
++#, c-format
++msgid "'%s' matches at least:\n"
++msgstr "‘%s’ matches at least:\n"
++
++#: g10/gpg.c:2330 g10/revoke.c:682
++#, c-format
++msgid "error searching the keyring: %s\n"
++msgstr "error searching the keyring: %s\n"
++
++#: g10/gpg.c:2423
+#, 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:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
+#, c-format
+msgid "'%s' is not a valid signature expiration\n"
+msgstr "‘%s’ is not a valid signature expiration\n"
+
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘%s’\n"
+
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
+#, c-format
+msgid "'%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
+
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
+#, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "will not run with insecure memory due to %s\n"
+
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth must be in the range from 1 to 255\n"
+
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
+
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "invalid S2K mode; must be 0, 1 or 3\n"
+
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
+#, 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:3497
++#: g10/gpg.c:3868
+#, 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:3502
++#: g10/gpg.c:3873
+#, 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:3595
++#: g10/gpg.c:3966
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
+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:3662
++#: g10/gpg.c:4047
++#, 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/gpg.c:4050
++#, c-format
++msgid "option '%s' given, but option '%s' not given\n"
++msgstr "option ‘%s’ given, but option ‘%s’ not given\n"
++
++#: g10/gpg.c:4064
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘%s’ failed: %s\n"
+
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
+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:3708
++#: g10/gpg.c:4110
+#, 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:3729
++#: g10/gpg.c:4131
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
+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:3768
++#: g10/gpg.c:4170
+#, 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:3792
++#: g10/gpg.c:4194
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
+msgid "--passwd <user-id>"
+msgstr "--passwd <user-id>"
+
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘%s’\n"
+
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
++#, c-format
++msgid "error parsing key specification '%s': %s\n"
++msgstr "error parsing key specification '%s': %s\n"
++
++#: g10/gpg.c:4807
++#, 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:4854
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
- #: g10/gpgv.c:74
++#: 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:76
++#: g10/gpgv.c:77
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
+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:104
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
+#: g10/import.c:107
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
+#: g10/import.c:110
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
+#: g10/import.c:113
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
+#: g10/import.c:116
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
+#: g10/import.c:119
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
+#: g10/import.c:122
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
+#: g10/import.c:341
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
+#: g10/import.c:359
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
+#: g10/import.c:431
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
+#: g10/import.c:434
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
+#: g10/import.c:436
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
+#: g10/import.c:439
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
+#: g10/import.c:442 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
+#: g10/import.c:446 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
+#: g10/import.c:448
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
+#: g10/import.c:450
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
+#: g10/import.c:452
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
+#: g10/import.c:454
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
+#: g10/import.c:456 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
+#: g10/import.c:458 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
+#: g10/import.c:460 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
+#: g10/import.c:462 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
+#: g10/import.c:464
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
+#: g10/import.c:466
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
+#: g10/import.c:811
+#, 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:853
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “%s”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:868
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “%s”: preference for digest algorithm %s\n"
+
+#: g10/import.c:880
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “%s”: preference for compression algorithm %s\n"
+
+#: g10/import.c:893
+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:895
+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:920
+#, 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:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
+#: g10/import.c:990
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
+#: g10/import.c:1021
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
+#: g10/import.c:1037
+#, 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:1047
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
+#: g10/import.c:1049
+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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
+#: g10/import.c:1068
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1079
++#: g10/import.c:1083
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
+#, c-format
+msgid "writing to '%s'\n"
+msgstr "writing to ‘%s’\n"
+
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1108
++#: g10/import.c:1112
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
+
- #: g10/import.c:1132
++#: g10/import.c:1136
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
+#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
+#, 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:1194
++#: g10/import.c:1203
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
+
- #: g10/import.c:1197
++#: g10/import.c:1206
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
+
- #: g10/import.c:1200
++#: g10/import.c:1209
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
+
- #: g10/import.c:1203
++#: g10/import.c:1212
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
+
- #: g10/import.c:1206
++#: g10/import.c:1215
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
+
- #: g10/import.c:1209
++#: g10/import.c:1218
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
+
- #: g10/import.c:1212
++#: g10/import.c:1221
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “%s” %d signature cleaned\n"
+
- #: g10/import.c:1215
++#: g10/import.c:1224
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “%s” %d signatures cleaned\n"
+
- #: g10/import.c:1218
++#: g10/import.c:1227
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "key %s: “%s” %d user ID cleaned\n"
+
- #: g10/import.c:1221
++#: g10/import.c:1230
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "key %s: “%s” %d user IDs cleaned\n"
+
- #: g10/import.c:1244
++#: g10/import.c:1253
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
+
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:1555
++#: g10/import.c:1568
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:1562
++#: g10/import.c:1575
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:1663
++#: g10/import.c:1680
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:1707
++#: g10/import.c:1724
+#, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "key %s: secret key with invalid cipher %d - skipped\n"
+
- #: g10/import.c:1808
++#. 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:1793
++#, 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:1844
+#, 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:1851
++#: g10/import.c:1893
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:1884
++#: g10/import.c:1926
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
+
- #: g10/import.c:1960
++#: g10/import.c:2002
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:1977
++#: g10/import.c:2019
+#, 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:1979
++#: g10/import.c:2021
+#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:1997
++#: g10/import.c:2039
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2011
++#: g10/import.c:2053
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2024
++#: g10/import.c:2066
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2040
++#: g10/import.c:2082
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2062
++#: g10/import.c:2104
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2075
++#: g10/import.c:2117
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2090
++#: g10/import.c:2132
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2135
++#: g10/import.c:2177
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
+
- #: g10/import.c:2158
++#: g10/import.c:2200
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2187
++#: g10/import.c:2229
+#, 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:2198
++#: g10/import.c:2240
+#, 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:2216
++#: g10/import.c:2258
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2230
++#: g10/import.c:2272
+#, 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:2238
++#: g10/import.c:2280
+#, 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:2367
++#: g10/import.c:2409
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:2431
++#: g10/import.c:2473
+#, 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:2447
++#: g10/import.c:2489
+#, 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:2511
++#: g10/import.c:2553
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
+
- #: g10/import.c:2549
++#: g10/import.c:2591
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:365 g10/keydb.c:392 sm/keydb.c:210
+#, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "error creating keybox '%s': %s\n"
+
+#: g10/keydb.c:368 g10/keydb.c:395
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:404 sm/keydb.c:217
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘%s’ created\n"
+
+#: g10/keydb.c:406
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘%s’ created\n"
+
- #: g10/keydb.c:678
++#: g10/keydb.c:740
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
++#, c-format
++msgid "error opening key DB: %s\n"
++msgstr "error opening key DB: %s\n"
++
++#: g10/keydb.c:1599
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
+msgid "[revocation]"
+msgstr "[revocation]"
+
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
+msgid "1 bad signature\n"
+msgstr "1 bad signature\n"
+
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d bad signatures\n"
+
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 signature not checked due to a missing key\n"
+
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d signatures not checked due to missing keys\n"
+
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
+msgid "1 signature not checked due to an error\n"
+msgstr "1 signature not checked due to an error\n"
+
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d signatures not checked due to errors\n"
+
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "1 user ID without valid self-signature detected\n"
+
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "%d user IDs without valid self-signatures detected\n"
+
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
+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:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
+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:491
++#: g10/keyedit.c:493
+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:618
++#: g10/keyedit.c:621
++#, 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:629
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “%s” is revoked."
+
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
+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:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “%s” is expired."
+
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “%s” is not self-signed."
+
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “%s” is signable. "
+
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
+#, 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:741
++#: g10/keyedit.c:752
+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:754
++#: g10/keyedit.c:765
+#, 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:759
++#: g10/keyedit.c:770
+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:780
++#: g10/keyedit.c:791
+#, 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:785
++#: g10/keyedit.c:796
+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:805
++#: g10/keyedit.c:816
+#, 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:809
++#: g10/keyedit.c:820
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
+
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
+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:836
++#: g10/keyedit.c:847
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
+#, 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:876
++#: g10/keyedit.c:887
+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:917
++#: g10/keyedit.c:928
+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:922
++#: g10/keyedit.c:933
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
+#, 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:926
++#: g10/keyedit.c:937
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
+#, 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:936
++#: g10/keyedit.c:947
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘?’ for more information): "
+
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
+#, 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:971
++#: g10/keyedit.c:982
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
+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:983
++#: g10/keyedit.c:994
+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:993
++#: g10/keyedit.c:1004
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
+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:1196
++#: g10/keyedit.c:1207
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
+msgid "moving a key signature to the correct place\n"
+msgstr "moving a key signature to the correct place\n"
+
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
+msgid "save and quit"
+msgstr "save and quit"
+
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
+msgid "select user ID N"
+msgstr "select user ID N"
+
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
+msgid "select subkey N"
+msgstr "select subkey N"
+
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
+msgid "check signatures"
+msgstr "check signatures"
+
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
+msgid "add a user ID"
+msgstr "add a user ID"
+
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
+msgid "add a subkey"
+msgstr "add a subkey"
+
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
+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:1406
++#: g10/keyedit.c:1417
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
+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:1417
++#: g10/keyedit.c:1428
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
+msgid "enable key"
+msgstr "enable key"
+
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
+msgid "disable key"
+msgstr "disable key"
+
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
+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:1439
++#: g10/keyedit.c:1450
+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:1551
++#: g10/keyedit.c:1562
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
+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:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
++msgid "Really sign all text user IDs? (y/N) "
++msgstr "Really sign all text user IDs? (y/N) "
++
++#: g10/keyedit.c:1773
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘%s’\n"
+
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
+#, 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:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘%s’ command.)\n"
+
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
+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:1875
++#: g10/keyedit.c:1896
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
+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:2005
++#: g10/keyedit.c:2026
+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:2043
++#: g10/keyedit.c:2064
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
+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:2073
++#: g10/keyedit.c:2094
+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:2075
++#: g10/keyedit.c:2096
+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:2124
++#: g10/keyedit.c:2145
+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:2169
++#: g10/keyedit.c:2190
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
+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:2178
++#: g10/keyedit.c:2199
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "secret key “%s” not found: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“%s” is not a fingerprint\n"
+
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“%s” is not the primary fingerprint\n"
+
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
+msgid "Digest: "
+msgstr "Digest: "
+
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
+msgid "Features: "
+msgstr "Features: "
+
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
+msgid "Notations: "
+msgstr "Notations: "
+
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
+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:3058
++#: g10/keyedit.c:3096
+#, 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:3082
++#: g10/keyedit.c:3120
+#, 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:3088
++#: g10/keyedit.c:3126
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
+msgid "card-no: "
+msgstr "card-no: "
+
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
+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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
+msgid "revoked"
+msgstr "revoked"
+
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
+msgid "expired"
+msgstr "expired"
+
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
+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:3461
++#: g10/keyedit.c:3499
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
+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:3521
++#: g10/keyedit.c:3559
+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:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
+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:3532
++#: g10/keyedit.c:3570
+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:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
+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:3646
++#: g10/keyedit.c:3684
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Deleted %d signature.\n"
+
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Deleted %d signatures.\n"
+
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
+msgid "invalid"
+msgstr "invalid"
+
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “%s” compacted: %s\n"
+
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "User ID “%s”: %d signature removed\n"
+
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
+#, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "User ID “%s”: %d signatures removed\n"
+
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “%s”: already minimized\n"
+
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “%s”: already clean\n"
+
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
+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:3821
++#: g10/keyedit.c:3859
+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:3838
++#: g10/keyedit.c:3876
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
+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:3878
++#: g10/keyedit.c:3916
+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:3900
++#: g10/keyedit.c:3938
+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:3919
++#: g10/keyedit.c:3957
+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:3925
++#: g10/keyedit.c:3963
+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:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Please select at most one subkey.\n"
++#: g10/keyedit.c:4014
++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:3978
++#: g10/keyedit.c:4019
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
+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:4095
++#: g10/keyedit.c:4140
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
+#, 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:4216
++#: g10/keyedit.c:4261
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
+#, 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:4428
++#: g10/keyedit.c:4473
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
+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:4508
++#: g10/keyedit.c:4553
+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:4567
++#: g10/keyedit.c:4612
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
++#, c-format
++msgid "No subkey with key ID '%s'.\n"
++msgstr "No subkey with key ID '%s'.\n"
++
++#: g10/keyedit.c:5014
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “%s”\n"
+
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
+#, 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:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
+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:5042
++#: g10/keyedit.c:5174
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
+#, 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:5131
++#: g10/keyedit.c:5263
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “%s” is already revoked\n"
+
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
+#, 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:5373
++#: g10/keyedit.c:5505
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
+#, 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:276
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘%s’ duplicated\n"
+
+#: g10/keygen.c:283
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:285
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:287
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: g10/keygen.c:428
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘%s’ in preference string\n"
+
+#: g10/keygen.c:907
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:953
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:1009
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1470
+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:1639
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1642
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1645
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1648
+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:1666
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1690
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1694
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1699
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1702
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1705
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1708
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1837 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:1841
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1845
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1847
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1849
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1854
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1856
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1861
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1863
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1869
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
+#: g10/keygen.c:1871
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
+#: g10/keygen.c:1873
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
+#: g10/keygen.c:1875
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
+#: g10/keygen.c:1879
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: g10/keygen.c:1969 sm/certreqgen-ui.c:206
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
+#: g10/keygen.c:1982 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:1984 sm/certreqgen-ui.c:216
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
+#: g10/keygen.c:2060
+#, 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:2068
+#, 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:2071 sm/certreqgen-ui.c:183
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:2085 sm/certreqgen-ui.c:193
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:2103 g10/keygen.c:2117
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
+#: g10/keygen.c:2162
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
+#: g10/keygen.c:2340
+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:2351
+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:2374
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:2379
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:2398 g10/keygen.c:2423
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:2405
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:2406
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:2411
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:2412
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:2416
+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:2429
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:2497
+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:2512
+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:2531
+msgid "Real name: "
+msgstr "Real name: "
+
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:2541
++#, 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:2545
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
+msgid "Email address: "
+msgstr "Email address: "
+
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
+msgid "Comment: "
+msgstr "Comment: "
+
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
+#, c-format
+msgid "You are using the '%s' character set.\n"
+msgstr "You are using the ‘%s’ character set.\n"
+
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
+#, 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:2610
++#: g10/keygen.c:2614
+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:2635
++#: g10/keygen.c:2639
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
+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:2646
++#: g10/keygen.c:2650
+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:2651
++#: g10/keygen.c:2655
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
+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:2671
++#: g10/keygen.c:2675
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
+msgid "passphrase not correctly repeated; try again"
+msgstr "passphrase not correctly repeated; try again"
+
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway. You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway. You can change your passphrase at any time,\n"
+"using this program with the option “--edit-key”.\n"
+"\n"
+
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
+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:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
+#, 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:3518
++#: g10/keygen.c:3522
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “%s” already exists\n"
+
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
+#, 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:3834
++#: g10/keygen.c:3841
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘%s’\n"
+
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
+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:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
+#, 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:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
+#, 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:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
+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:4291
++#: g10/keygen.c:4304
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
+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:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
+#, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "storing key onto card failed: %s\n"
+
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
+#, c-format
+msgid "Note: backup of card key saved to '%s'\n"
+msgstr "Note: backup of card key saved to ‘%s’\n"
+
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
+msgid "never "
+msgstr "never "
+
- #: g10/keylist.c:309
++#: g10/keylist.c:331
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
- #: g10/keylist.c:311
++#: g10/keylist.c:333
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
- #: g10/keylist.c:353
++#: g10/keylist.c:375
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
- #: g10/keylist.c:406
++#: g10/keylist.c:428
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
- #: g10/keylist.c:408
++#: g10/keylist.c:430
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
- #: g10/keylist.c:446
++#: g10/keylist.c:468
+msgid "1 good signature\n"
+msgstr "1 good signature\n"
+
- #: g10/keylist.c:448
++#: g10/keylist.c:470
+#, c-format
+msgid "%d good signatures\n"
+msgstr "%d good signatures\n"
+
- #: g10/keylist.c:543
++#: g10/keylist.c:565
+#, c-format
+msgid "Warning: %lu key(s) skipped due to their large size\n"
+msgstr "Warning: %lu key(s) skipped due to their large size\n"
+
- #: g10/keylist.c:563
++#: g10/keylist.c:585
+msgid "Keyring"
+msgstr "Keyring"
+
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “%s”: %s\n"
+
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
+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:1864
++#: g10/keylist.c:1898
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
+#, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
+
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘%s’\n"
+
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
+#, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu keys cached so far (%lu signatures)\n"
+
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
+#, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu keys cached (%lu signatures)\n"
+
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
+msgid "override proxy options set for dirmngr"
+msgstr "override proxy options set for dirmngr"
+
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
+msgid "override timeout options set for dirmngr"
+msgstr "override timeout options set for dirmngr"
+
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr "honor the PKA record set on a key when retrieving keys"
+
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
+msgid "disabled"
+msgstr "disabled"
+
- #: g10/keyserver.c:755
++#: 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:861
++#: 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:1002 g10/keyserver.c:1117
++#: 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:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
+#, c-format
+msgid "refreshing 1 key from %s\n"
+msgstr "refreshing 1 key from %s\n"
+
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
+#, 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:1439
++#: g10/keyserver.c:1442
+#, c-format
+msgid "refreshing %d keys from %s\n"
+msgstr "refreshing %d keys from %s\n"
+
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “%s” not found on keyserver\n"
+
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
+#, c-format
+msgid "sending key %s to %s server %s\n"
+msgstr "sending key %s to %s server %s\n"
+
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘%s’\n"
+
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
+#: g10/mainproc.c:257
+#, 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:305
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
+#: g10/mainproc.c:315
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
+#: g10/mainproc.c:381
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
+#: g10/mainproc.c:459
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
+#: g10/mainproc.c:492
+#, 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:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “%s”\n"
+
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
+#: g10/mainproc.c:517
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
+#: g10/mainproc.c:533
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
+#: g10/mainproc.c:535
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
+#: g10/mainproc.c:569 g10/mainproc.c:590
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
+#: g10/mainproc.c:576
+#, 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:621 g10/mainproc.c:635
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
+#: g10/mainproc.c:631
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
+#: g10/mainproc.c:640
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "cleared passphrase cached with ID: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “for-your-eyes-only”\n"
+
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “gpg --import” to apply\n"
+
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “%s”"
+
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “%s”"
+
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “%s”"
+
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
+#, 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:1729
++#: g10/mainproc.c:1746
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “%s”"
+
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
+#, 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:2104
++#: g10/mainproc.c:2144
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
+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:2254
++#: g10/mainproc.c:2294
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
+msgid "old style (PGP 2.x) signature\n"
+msgstr "old style (PGP 2.x) signature\n"
+
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
+#, c-format
+msgid "fstat of '%s' failed in %s: %s\n"
+msgstr "fstat of ‘%s’ failed in %s: %s\n"
+
- #: g10/misc.c:171
++#: g10/misc.c:172
+#, c-format
+msgid "fstat(%d) failed in %s: %s\n"
+msgstr "fstat(%d) failed in %s: %s\n"
+
- #: g10/misc.c:280
++#: g10/misc.c:281
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "WARNING: using experimental public key algorithm %s\n"
+
- #: g10/misc.c:287
++#: g10/misc.c:288
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+
- #: g10/misc.c:301
++#: g10/misc.c:302
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "WARNING: using experimental cipher algorithm %s\n"
+
- #: g10/misc.c:317
++#: g10/misc.c:321
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "WARNING: using experimental digest algorithm %s\n"
+
- #: g10/misc.c:324
++#: g10/misc.c:330
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNING: digest algorithm %s is deprecated\n"
+
- #: g10/misc.c:339
++#: g10/misc.c:355
+#, 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:997
++#: g10/misc.c:1012
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “%s”\n"
+
- #: g10/misc.c:1001
++#: g10/misc.c:1016
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “%s” is a deprecated option\n"
+
- #: g10/misc.c:1003
++#: g10/misc.c:1018
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “%s%s” instead\n"
+
- #: g10/misc.c:1010
++#: g10/misc.c:1025
+#, 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:1020
++#: g10/misc.c:1035
+#, 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:1024
++#: g10/misc.c:1039
+#, 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:1088
++#: g10/misc.c:1103
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
- #: g10/misc.c:1233
++#: g10/misc.c:1248
+#, 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:1408
++#: g10/misc.c:1423
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘%s’\n"
+
- #: g10/misc.c:1433
++#: g10/misc.c:1448
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘%s’\n"
+
- #: g10/misc.c:1671
++#: g10/misc.c:1686
+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:1708
++#, c-format
++msgid "unknown weak digest '%s'\n"
++msgstr "unknown weak digest ‘%s’\n"
++
+#: g10/openfile.c:85
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘%s’ exists. "
+
+#: g10/openfile.c:89
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:124
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:148
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:219
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:367
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘%s’\n"
+
+#: g10/openfile.c:458
+#, c-format
+msgid "new configuration file '%s' created\n"
+msgstr "new configuration file ‘%s’ created\n"
+
+#: g10/openfile.c:499
+#, 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:258
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
+#: g10/parse-packet.c:1114
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
+#: g10/parse-packet.c:1632
+#, 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:74 g10/passphrase.c:332 g10/passphrase.c:394
+#, c-format
+msgid "problem with the agent: %s\n"
+msgstr "problem with the agent: %s\n"
+
+#: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
+#: g10/passphrase.c:278
+#, 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:297
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
+#: g10/passphrase.c:326
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
+#: g10/passphrase.c:484
+#, 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:492
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
+#: g10/passphrase.c:501
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
+#: g10/passphrase.c:666
+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:670
+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:675
+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:678
+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:683
+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:686
+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:695
+#, 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:379
+msgid "unable to display photo ID!\n"
+msgstr "unable to display photo ID!\n"
+
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
+msgid "No reason specified"
+msgstr "No reason specified"
+
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
+msgid "User ID is no longer valid"
+msgstr "User ID is no longer valid"
+
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
+msgid "reason for revocation: "
+msgstr "reason for revocation: "
+
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
+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:217
++#: g10/pkclist.c:218
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
+
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
+#, c-format
+msgid " aka \"%s\"\n"
+msgstr " aka “%s”\n"
+
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
+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:283
++#: g10/pkclist.c:284
+#, 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:285
++#: g10/pkclist.c:286
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = I do NOT trust\n"
+
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = I trust ultimately\n"
+
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
+msgid " m = back to the main menu\n"
+msgstr " m = back to the main menu\n"
+
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
+msgid " s = skip this key\n"
+msgstr " s = skip this key\n"
+
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
+msgid " q = quit\n"
+msgstr " q = quit\n"
+
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
+#, 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:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
+msgid "Your decision? "
+msgstr "Your decision? "
+
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
+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:346
++#: g10/pkclist.c:347
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificates leading to an ultimately trusted key:\n"
+
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
+#, 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:440
++#: g10/pkclist.c:441
+#, 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:446
++#: g10/pkclist.c:447
+msgid "This key probably belongs to the named user\n"
+msgstr "This key probably belongs to the named user\n"
+
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr "This key belongs to us\n"
+
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
+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:496
++#: g10/pkclist.c:497
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
+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:546
++#: g10/pkclist.c:547
+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:549
++#: g10/pkclist.c:550
+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:550
++#: g10/pkclist.c:551
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
+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:561
++#: g10/pkclist.c:562
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
+#, c-format
+msgid "Note: Verified signer's address is '%s'\n"
+msgstr "Note: Verified signer's address is ‘%s’\n"
+
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
+#, 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:600
++#: g10/pkclist.c:601
+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:608
++#: g10/pkclist.c:609
+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:619
++#: g10/pkclist.c:620
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
+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:632
++#: g10/pkclist.c:633
+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:640
++#: g10/pkclist.c:641
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
+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:651
++#: g10/pkclist.c:652
+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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
+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:1039
++#: g10/pkclist.c:1040
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
+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:1089
++#: g10/pkclist.c:1090
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “%s”\n"
+
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
+#, 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:109
++#: g10/plaintext.c:85
+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:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
+#, c-format
+msgid "can't open signed data '%s'\n"
+msgstr "can't open signed data ‘%s’\n"
+
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
+#, 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:117
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:124
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:283
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:311
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "cipher algorithm %d%s is unknown or disabled\n"
+
+#: g10/pubkey-enc.c:353
+#, 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:378
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:385
+msgid "Note: key has been revoked"
+msgstr "Note: key has been revoked"
+
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:145
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
- #: g10/revoke.c:308
++#: g10/revoke.c:313
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
- #: g10/revoke.c:312
++#: g10/revoke.c:317
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
- #: g10/revoke.c:316
++#: g10/revoke.c:323
++msgid "Secret key is not available.\n"
++msgstr "Secret key is not available.\n"
++
++#: g10/revoke.c:328
+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:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
- #: g10/revoke.c:408
++#: g10/revoke.c:416
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
- #: g10/revoke.c:414
++#: g10/revoke.c:422
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “%s”\n"
+
- #: g10/revoke.c:544
++#: g10/revoke.c:552
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
- #: g10/revoke.c:560
++#: g10/revoke.c:568
+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."
+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."
+
- #: g10/revoke.c:564
++#: g10/revoke.c:572
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before making use of this revocation certificate."
+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 making use of this revocation certificate."
+
- #: g10/revoke.c:645
++#: g10/revoke.c:628
++#, 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:655
++#, c-format
++msgid "'%s' matches multiple secret keys:\n"
++msgstr "‘%s’ matches multiple secret keys:\n"
++
++#: g10/revoke.c:705
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
- #: g10/revoke.c:669
++#: g10/revoke.c:729
+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:703
++#: g10/revoke.c:763
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
- #: g10/revoke.c:713
++#: g10/revoke.c:773
+msgid "Cancel"
+msgstr "Cancel"
+
- #: g10/revoke.c:715
++#: g10/revoke.c:775
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
- #: g10/revoke.c:756
++#: g10/revoke.c:816
+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:784
++#: g10/revoke.c:844
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
- #: g10/revoke.c:786
++#: g10/revoke.c:846
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
- #: g10/revoke.c:791
++#: g10/revoke.c:851
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: g10/seskey.c:61 sm/encrypt.c:123
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
+#: g10/seskey.c:65
+#, 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:298
+#, 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:316
+#, 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:81
++#: g10/sig-check.c:113
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
+#, 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:110
++#: g10/sig-check.c:142
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
+#, 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:222
++#: g10/sig-check.c:271
+#, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "public key %s is %lu second newer than the signature\n"
+
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
+#, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "public key %s is %lu seconds newer than the signature\n"
+
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
+#, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
+#, 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:607
++#: g10/sig-check.c:765
+#, 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:634
++#: g10/sig-check.c:792
+#, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "key %s: no subkey for subkey binding signature\n"
+
+#: g10/sign.c:89
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+
+#: g10/sign.c:115
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+
+#: g10/sign.c:138
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+
+#: g10/sign.c:301
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “%s”\n"
+
+#: g10/sign.c:848
+#, 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:979
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1254
++#: g10/sign.c:1255
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
+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:180
++#: g10/skclist.c:181
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “%s”: duplicated\n"
+
- #: g10/skclist.c:199
++#: g10/skclist.c:200
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
- #: g10/skclist.c:218
++#: g10/skclist.c:219
+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:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
+#, 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:106
+#, 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:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
+#, c-format
+msgid "error in '%s': %s\n"
+msgstr "error in '%s': %s\n"
+
+#: g10/tdbdump.c:163
+msgid "line too long"
+msgstr "line too long"
+
+#: g10/tdbdump.c:171
+msgid "colon missing"
+msgstr "colon missing"
+
+#: g10/tdbdump.c:177
+msgid "invalid fingerprint"
+msgstr "invalid fingerprint"
+
+#: g10/tdbdump.c:182
+msgid "ownertrust value missing"
+msgstr "ownertrust value missing"
+
+#: g10/tdbdump.c:218
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
+#: g10/tdbdump.c:222
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
+#: g10/tdbio.c:141 sm/keydb.c:339
+#, 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:1768
+#, 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:1779
+#, 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:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
+#, c-format
+msgid "can't access '%s': %s\n"
+msgstr "can't access '%s': %s\n"
+
+#: g10/tdbio.c:688
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
+#: g10/tdbio.c:711
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
+#: g10/tdbio.c:716
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
+#: g10/tdbio.c:719
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
+#: g10/tdbio.c:776
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
+#: g10/tdbio.c:785
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
+#: g10/tdbio.c:822
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
+#: g10/tdbio.c:830
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
+#: g10/tdbio.c:853 g10/tdbio.c:879 g10/tdbio.c:897 g10/tdbio.c:917
+#: g10/tdbio.c:952 g10/tdbio.c:1692 g10/tdbio.c:1721
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
+#: g10/tdbio.c:926
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
+#: g10/tdbio.c:1451
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
+#: g10/tdbio.c:1462
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
+#: g10/tdbio.c:1487
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
+#: g10/tdbio.c:1509
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
+#: g10/tdbio.c:1515
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
+#: g10/tdbio.c:1729
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
+#: g10/tdbio.c:1738
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
+#: g10/tdbio.c:1749
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
+#: g10/tdbio.c:1785
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
+#: g10/tdbio.c:1846
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
+#: g10/textfilter.c:147
+#, 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:242
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "‘%s’ is not a valid long keyID\n"
+
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
+#, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "key %s occurs more than once in the trustdb\n"
+
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
+#, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "key %s: no public key for trusted key - skipped\n"
+
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
+#, 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:339
++#: g10/trustdb.c:347
+#, 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:412
++#: g10/trustdb.c:422
+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:421
++#: g10/trustdb.c:431
+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:456
++#: g10/trustdb.c:468
+#, 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:462
++#: g10/trustdb.c:474
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
- #: g10/trustdb.c:511
++#: 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:526
++#: 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:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d keys processed (%d validity counts cleared)\n"
+
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
+#, 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:1829
++#: g10/trustdb.c:1958
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
+#, 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:1990
++#: g10/trustdb.c:2123
+#, 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:106
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trust.c:107
+msgid "never"
+msgstr "never"
+
+#: g10/trust.c:108
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trust.c:109
+msgid "full"
+msgstr "full"
+
+#: g10/trust.c:110
+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:147
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
+#: g10/trust.c:150
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trust.c:152 g10/trust.c:158
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trust.c:157
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trust.c:159
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: 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:118
+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:205
+#, 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:254
+#, 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:2992
+#, 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:3004
+#, 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:1938 scd/app-openpgp.c:1955 scd/app-openpgp.c:2219
+#: scd/app-openpgp.c:2266 scd/app-openpgp.c:2371 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:2300 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:3597
+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:3605
+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:3615
+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:2213
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:1783 scd/app-openpgp.c:1962 scd/app-openpgp.c:2226
+#, 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:1974
+#: scd/app-openpgp.c:3924
+#, 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:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
+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:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:1877
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%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:1884
+#, 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:1888
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:1909
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2262
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2272 scd/app-openpgp.c:2326
+#, 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:2295
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2296
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2296
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2367
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2368
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2424 scd/app-openpgp.c:3683
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2430 scd/app-openpgp.c:3690
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2440
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2444
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2446
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2448
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:2972 scd/app-openpgp.c:3323
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3014 scd/app-openpgp.c:3022
+#, 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:3155 scd/app-openpgp.c:3415
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3317
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3574
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3587
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3590
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "key generation completed (%d seconds)\n"
+
+#: scd/app-openpgp.c:3648
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:3698
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:3814
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:3899
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
+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:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
+#, 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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LEVEL|set the debugging level to LEVEL"
+
+#: scd/scdaemon.c:132 tools/gpgconf-comp.c:651
+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:286
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
+#: scd/scdaemon.c:288
+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:802
+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:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
+#, 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:221 tools/gpg-connect-agent.c:2238
+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:525
+msgid "looking up issuer at external location\n"
+msgstr "looking up issuer at external location\n"
+
+#: sm/certchain.c:544
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr "number of issuers matching: %d\n"
+
+#: sm/certchain.c:588
+msgid "looking up issuer from the Dirmngr cache\n"
+msgstr "looking up issuer from the Dirmngr cache\n"
+
+#: sm/certchain.c:612
+#, c-format
+msgid "number of matching certificates: %d\n"
+msgstr "number of matching certificates: %d\n"
+
+#: sm/certchain.c:614
+#, c-format
+msgid "dirmngr cache-only key lookup failed: %s\n"
+msgstr "dirmngr cache-only key lookup failed: %s\n"
+
+#: sm/certchain.c:813 sm/certchain.c:1307 sm/certchain.c:1947 sm/decrypt.c:262
+#: sm/encrypt.c:339 sm/import.c:410 sm/keydb.c:1109 sm/keydb.c:1195
+#: 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:979
+msgid "certificate has been revoked"
+msgstr "certificate has been revoked"
+
+#: sm/certchain.c:994
+msgid "the status of the certificate is unknown"
+msgstr "the status of the certificate is unknown"
+
+#: sm/certchain.c:1001
+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:1007
+#, c-format
+msgid "checking the CRL failed: %s"
+msgstr "checking the CRL failed: %s"
+
+#: sm/certchain.c:1036 sm/certchain.c:1104 dirmngr/validate.c:473
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "certificate with invalid validity: %s"
+
+#: sm/certchain.c:1051 sm/certchain.c:1136 dirmngr/validate.c:491
+msgid "certificate not yet valid"
+msgstr "certificate not yet valid"
+
+#: sm/certchain.c:1052 sm/certchain.c:1137
+msgid "root certificate not yet valid"
+msgstr "root certificate not yet valid"
+
+#: sm/certchain.c:1053 sm/certchain.c:1138
+msgid "intermediate certificate not yet valid"
+msgstr "intermediate certificate not yet valid"
+
+#: sm/certchain.c:1066 dirmngr/validate.c:502
+msgid "certificate has expired"
+msgstr "certificate has expired"
+
+#: sm/certchain.c:1067
+msgid "root certificate has expired"
+msgstr "root certificate has expired"
+
+#: sm/certchain.c:1068
+msgid "intermediate certificate has expired"
+msgstr "intermediate certificate has expired"
+
+#: sm/certchain.c:1110
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr "required certificate attributes missing: %s%s%s"
+
+#: sm/certchain.c:1119
+msgid "certificate with invalid validity"
+msgstr "certificate with invalid validity"
+
+#: sm/certchain.c:1156
+msgid "signature not created during lifetime of certificate"
+msgstr "signature not created during lifetime of certificate"
+
+#: sm/certchain.c:1158
+msgid "certificate not created during lifetime of issuer"
+msgstr "certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1159
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr "intermediate certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1163
+msgid " ( signature created at "
+msgstr " ( signature created at "
+
+#: sm/certchain.c:1164
+msgid " (certificate created at "
+msgstr " (certificate created at "
+
+#: sm/certchain.c:1167
+msgid " (certificate valid from "
+msgstr " (certificate valid from "
+
+#: sm/certchain.c:1168
+msgid " ( issuer valid from "
+msgstr " ( issuer valid from "
+
+#: sm/certchain.c:1198 dirmngr/validate.c:552
+#, c-format
+msgid "fingerprint=%s\n"
+msgstr "fingerprint=%s\n"
+
+#: sm/certchain.c:1207
+msgid "root certificate has now been marked as trusted\n"
+msgstr "root certificate has now been marked as trusted\n"
+
+#: sm/certchain.c:1220
+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:1226
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr "interactive marking as trusted disabled for this session\n"
+
+#: sm/certchain.c:1284
+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:1348
+msgid "no issuer found in certificate"
+msgstr "no issuer found in certificate"
+
+#: sm/certchain.c:1429
+msgid "self-signed certificate has a BAD signature"
+msgstr "self-signed certificate has a BAD signature"
+
+#: sm/certchain.c:1498 dirmngr/validate.c:550
+msgid "root certificate is not marked trusted"
+msgstr "root certificate is not marked trusted"
+
+#: sm/certchain.c:1514
+#, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "checking the trust list failed: %s\n"
+
+#: sm/certchain.c:1545 sm/import.c:176 dirmngr/validate.c:605
+msgid "certificate chain too long\n"
+msgstr "certificate chain too long\n"
+
+#: sm/certchain.c:1557 dirmngr/validate.c:617
+msgid "issuer certificate not found"
+msgstr "issuer certificate not found"
+
+#: sm/certchain.c:1590 dirmngr/validate.c:643
+msgid "certificate has a BAD signature"
+msgstr "certificate has a BAD signature"
+
+#: sm/certchain.c:1621 dirmngr/validate.c:667
+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
+#, 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
+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
+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
+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
+#, 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
+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
+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
+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
+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
+msgid "certificate is not usable for encryption\n"
+msgstr "certificate is not usable for encryption\n"
+
+#: sm/certlist.c:168 dirmngr/validate.c:1135
+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:1309
++#: 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:1205 sm/keydb.c:1307
+#, 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:325
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
+#: sm/gpgsm.c:204
+msgid "list external keys"
+msgstr "list external keys"
+
+#: sm/gpgsm.c:206
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
+#: sm/gpgsm.c:213
+msgid "import certificates"
+msgstr "import certificates"
+
+#: sm/gpgsm.c:214
+msgid "export certificates"
+msgstr "export certificates"
+
+#: sm/gpgsm.c:222
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
+#: sm/gpgsm.c:225
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
+#: sm/gpgsm.c:227
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
+#: sm/gpgsm.c:243
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:248
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
+#: sm/gpgsm.c:250
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
+#: sm/gpgsm.c:252
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
+#: sm/gpgsm.c:259
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
+#: sm/gpgsm.c:269
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
+#: sm/gpgsm.c:274
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
+#: sm/gpgsm.c:277
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:280
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
+#: sm/gpgsm.c:284
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:295
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: sm/gpgsm.c:297
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
+#: sm/gpgsm.c:302
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
+#: sm/gpgsm.c:305
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
+#: sm/gpgsm.c:306
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
+#: sm/gpgsm.c:307
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
+#: sm/gpgsm.c:310
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
+#: sm/gpgsm.c:313
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
+#: sm/gpgsm.c:323 tools/gpgconf-comp.c:789
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: sm/gpgsm.c:341
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
+#: sm/gpgsm.c:343
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
+#: sm/gpgsm.c:559
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
+#: sm/gpgsm.c:562
+msgid ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+msgstr ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+
+#: sm/gpgsm.c:766
+#, c-format
+msgid "Note: won't be able to encrypt to '%s': %s\n"
+msgstr "Note: won't be able to encrypt to '%s': %s\n"
+
+#: sm/gpgsm.c:777
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘%s’\n"
+
+#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%s:%u: no hostname given\n"
+
+#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: password given without user\n"
+
+#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
+#: sm/gpgsm.c:1420
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
+#: sm/gpgsm.c:1614
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘%s’\n"
+
+#: sm/gpgsm.c:1655
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
+#: sm/gpgsm.c:2011
+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:1225 sm/keydb.c:1319
+#, 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:1434
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
+#: sm/keydb.c:1102 sm/keydb.c:1188
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/keydb.c:1144
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
+#: sm/keydb.c:1156
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
+#: sm/keydb.c:1164
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
+#: sm/keydb.c:1216
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
+#: sm/keydb.c:1237 sm/keydb.c:1330
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
+#: sm/keylist.c:658
+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
+#, c-format
+msgid "can't parse certificate '%s': %s\n"
+msgstr "can't parse certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:398
+#, c-format
+msgid "certificate '%s' already cached\n"
+msgstr "certificate ‘%s’ already cached\n"
+
+#: dirmngr/certcache.c:402
+#, c-format
+msgid "trusted certificate '%s' loaded\n"
+msgstr "trusted certificate ‘%s’ loaded\n"
+
+#: dirmngr/certcache.c:404
+#, c-format
+msgid "certificate '%s' loaded\n"
+msgstr "certificate ‘%s’ loaded\n"
+
+#: dirmngr/certcache.c:408
+#, c-format
+msgid " SHA1 fingerprint = %s\n"
+msgstr " SHA1 fingerprint = %s\n"
+
+#: dirmngr/certcache.c:411
+msgid " issuer ="
+msgstr " issuer ="
+
+#: dirmngr/certcache.c:412
+msgid " subject ="
+msgstr " subject ="
+
+#: dirmngr/certcache.c:416
+#, c-format
+msgid "error loading certificate '%s': %s\n"
+msgstr "error loading certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:492
+#, c-format
+msgid "permanently loaded certificates: %u\n"
+msgstr "permanently loaded certificates: %u\n"
+
+#: dirmngr/certcache.c:494
+#, c-format
+msgid " runtime cached certificates: %u\n"
+msgstr " runtime cached certificates: %u\n"
+
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
+msgid "certificate already cached\n"
+msgstr "certificate already cached\n"
+
+#: dirmngr/certcache.c:511
+msgid "certificate cached\n"
+msgstr "certificate cached\n"
+
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
+#, c-format
+msgid "error caching certificate: %s\n"
+msgstr "error caching certificate: %s\n"
+
+#: dirmngr/certcache.c:596
+#, c-format
+msgid "invalid SHA1 fingerprint string '%s'\n"
+msgstr "invalid SHA1 fingerprint string ‘%s’\n"
+
+#: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
+#, 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
+#, 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
+msgid "no issuer found in certificate\n"
+msgstr "no issuer found in certificate\n"
+
+#: dirmngr/certcache.c:1328
+#, 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:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
+#, 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:1356
+#, 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:1359
+#, 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:1370
+#, 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:1378
+#, c-format
+msgid "error getting data from cache file: %s\n"
+msgstr "error getting data from cache file: %s\n"
+
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "unknown hash algorithm ‘%s’\n"
+
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
+#, 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:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
+msgid "got an invalid S-expression from libksba\n"
+msgstr "got an invalid S-expression from libksba\n"
+
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
+#, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "converting S-expression failed: %s\n"
+
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
+#, c-format
+msgid "creating S-expression failed: %s\n"
+msgstr "creating S-expression failed: %s\n"
+
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
+#, c-format
+msgid "ksba_crl_parse failed: %s\n"
+msgstr "ksba_crl_parse failed: %s\n"
+
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
+#, c-format
+msgid "error getting update times of CRL: %s\n"
+msgstr "error getting update times of CRL: %s\n"
+
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
+#, 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:1722
++#: dirmngr/crlcache.c:1724
+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:1742
++#: dirmngr/crlcache.c:1744
+#, c-format
+msgid "error getting CRL item: %s\n"
+msgstr "error getting CRL item: %s\n"
+
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
+#, 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:1784
++#: dirmngr/crlcache.c:1786
+#, c-format
+msgid "no CRL issuer found in CRL: %s\n"
+msgstr "no CRL issuer found in CRL: %s\n"
+
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
+msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
+msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
+
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
+#, c-format
+msgid "CRL signature verification failed: %s\n"
+msgstr "CRL signature verification failed: %s\n"
+
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
+#, 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:1998
++#: dirmngr/crlcache.c:2000
+#, c-format
+msgid "ksba_crl_new failed: %s\n"
+msgstr "ksba_crl_new failed: %s\n"
+
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
+#, c-format
+msgid "ksba_crl_set_reader failed: %s\n"
+msgstr "ksba_crl_set_reader failed: %s\n"
+
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
+#, c-format
+msgid "removed stale temporary cache file '%s'\n"
+msgstr "removed stale temporary cache file ‘%s’\n"
+
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
+#, 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:2053
++#: dirmngr/crlcache.c:2055
+#, c-format
+msgid "error creating temporary cache file '%s': %s\n"
+msgstr "error creating temporary cache file '%s': %s\n"
+
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
+#, c-format
+msgid "crl_parse_insert failed: %s\n"
+msgstr "crl_parse_insert failed: %s\n"
+
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
+#, c-format
+msgid "error finishing temporary cache file '%s': %s\n"
+msgstr "error finishing temporary cache file '%s': %s\n"
+
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
+#, c-format
+msgid "error closing temporary cache file '%s': %s\n"
+msgstr "error closing temporary cache file '%s': %s\n"
+
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
+#, 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:2109
++#: dirmngr/crlcache.c:2111
+#, 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:2125
++#: dirmngr/crlcache.c:2127
+#, c-format
+msgid "unknown critical CRL extension %s\n"
+msgstr "unknown critical CRL extension %s\n"
+
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
+#, c-format
+msgid "error reading CRL extensions: %s\n"
+msgstr "error reading CRL extensions: %s\n"
+
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
+#, c-format
+msgid "creating cache file '%s'\n"
+msgstr "creating cache file ‘%s’\n"
+
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
+#, c-format
+msgid "problem renaming '%s' to '%s': %s\n"
+msgstr "problem renaming ‘%s’ to '%s': %s\n"
+
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
+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:2269
++#: dirmngr/crlcache.c:2271
+#, c-format
+msgid "Begin CRL dump (retrieved via %s)\n"
+msgstr "Begin CRL dump (retrieved via %s)\n"
+
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
+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:2295
++#: dirmngr/crlcache.c:2297
+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:2298
++#: dirmngr/crlcache.c:2300
+msgid " ERROR: The CRL will not be used\n"
+msgstr " ERROR: The CRL will not be used\n"
+
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
+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:2323
++#: dirmngr/crlcache.c:2325
+msgid " WARNING: invalid cache record length\n"
+msgstr " WARNING: invalid cache record length\n"
+
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
+#, c-format
+msgid "problem reading cache record: %s\n"
+msgstr "problem reading cache record: %s\n"
+
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
+#, c-format
+msgid "problem reading cache key: %s\n"
+msgstr "problem reading cache key: %s\n"
+
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
+#, c-format
+msgid "error reading cache entry from db: %s\n"
+msgstr "error reading cache entry from db: %s\n"
+
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
+msgid "End CRL dump\n"
+msgstr "End CRL dump\n"
+
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
+#, c-format
+msgid "crl_fetch via DP failed: %s\n"
+msgstr "crl_fetch via DP failed: %s\n"
+
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
+#, c-format
+msgid "crl_cache_insert via DP failed: %s\n"
+msgstr "crl_cache_insert via DP failed: %s\n"
+
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
+#, 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:557
+#, 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"
++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:70
++#: dirmngr/dirmngr-client.c:71
+msgid "use OCSP instead of CRLs"
+msgstr "use OCSP instead of CRLs"
+
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
+msgid "check whether a dirmngr is running"
+msgstr "check whether a dirmngr is running"
+
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
+msgid "add a certificate to the cache"
+msgstr "add a certificate to the cache"
+
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
+msgid "validate a certificate"
+msgstr "validate a certificate"
+
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
+msgid "lookup a certificate"
+msgstr "lookup a certificate"
+
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
+msgid "lookup only locally stored certificates"
+msgstr "lookup only locally stored certificates"
+
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
+msgid "expect an URL for --lookup"
+msgstr "expect an URL for --lookup"
+
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
+msgid "load a CRL into the dirmngr"
+msgstr "load a CRL into the dirmngr"
+
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
+msgid "special mode for use by Squid"
+msgstr "special mode for use by Squid"
+
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
+msgid "expect certificates in PEM format"
+msgstr "expect certificates in PEM format"
+
- #: dirmngr/dirmngr-client.c:81
++#: 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:151
++#: dirmngr/dirmngr-client.c:150
+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:155
++#: dirmngr/dirmngr-client.c:154
+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:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
+#, c-format
+msgid "error reading certificate from stdin: %s\n"
+msgstr "error reading certificate from stdin: %s\n"
+
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
+#, c-format
+msgid "error reading certificate from '%s': %s\n"
+msgstr "error reading certificate from '%s': %s\n"
+
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
+msgid "certificate too large to make any sense\n"
+msgstr "certificate too large to make any sense\n"
+
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
++#, c-format
++msgid "can't connect to the dirmngr: %s\n"
++msgstr "can't connect to the dirmngr: %s\n"
++
++#: dirmngr/dirmngr-client.c:327
+#, c-format
+msgid "lookup failed: %s\n"
+msgstr "lookup failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
+#, c-format
+msgid "loading CRL '%s' failed: %s\n"
+msgstr "loading CRL ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
+msgid "a dirmngr daemon is up and running\n"
+msgstr "a dirmngr daemon is up and running\n"
+
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
+#, c-format
+msgid "validation of certificate failed: %s\n"
+msgstr "validation of certificate failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
+msgid "certificate is valid\n"
+msgstr "certificate is valid\n"
+
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
+msgid "certificate has been revoked\n"
+msgstr "certificate has been revoked\n"
+
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
+#, c-format
+msgid "certificate check failed: %s\n"
+msgstr "certificate check failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
+#, c-format
+msgid "got status: '%s'\n"
+msgstr "got status: ‘%s’\n"
+
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
+#, c-format
+msgid "error writing base64 encoding: %s\n"
+msgstr "error writing base64 encoding: %s\n"
+
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "failed to allocate assuan context: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr "apparently no running dirmngr\n"
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr "no running dirmngr - starting one\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr "malformed %s environment variable\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "dirmngr protocol version %d is not supported\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "can't connect to the dirmngr - trying fall back\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "can't connect to the dirmngr: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
+#, c-format
+msgid "unsupported inquiry '%s'\n"
+msgstr "unsupported inquiry ‘%s’\n"
+
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
+msgid "absolute file name expected\n"
+msgstr "absolute file name expected\n"
+
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
+#, c-format
+msgid "looking up '%s'\n"
+msgstr "looking up ‘%s’\n"
+
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
+msgid "run as windows service (background)"
+msgstr "run as windows service (background)"
+
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
+msgid "flush the cache"
+msgstr "flush the cache"
+
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
+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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
+msgid "|N|set LDAP timeout to N seconds"
+msgstr "|N|set LDAP timeout to N seconds"
+
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
+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:219
++#: dirmngr/dirmngr.c:222
+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:221
- msgid "route all network traffic via TOR"
- msgstr "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
++msgid "route all network traffic via Tor"
++msgstr "route all network traffic via Tor"
+
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
+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:350
++#: dirmngr/dirmngr.c:353
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
+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:432
++#: dirmngr/dirmngr.c:435
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
+#, 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:1794
++#: dirmngr/dirmngr.c:1804
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
+#, 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:664
+#, 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:646
+#, c-format
+msgid "binding to '%s:%d' failed: %s\n"
+msgstr "binding to ‘%s:%d’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:673
+#, c-format
+msgid "searching '%s' failed: %s\n"
+msgstr "searching ‘%s’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:705
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘%s’ is not an LDAP URL\n"
+
+#: dirmngr/dirmngr_ldap.c:711
+#, 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:496
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
- #: dirmngr/ldap.c:603
++#: 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:809
++#: 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:164
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: dirmngr/misc.c:188 dirmngr/misc.c:222
+#, c-format
+msgid "gcry_md_open failed: %s\n"
+msgstr "gcry_md_open failed: %s\n"
+
+#: dirmngr/misc.c:193 dirmngr/misc.c:227
+#, c-format
+msgid "oops: ksba_cert_hash failed: %s\n"
+msgstr "oops: ksba_cert_hash failed: %s\n"
+
+#: dirmngr/misc.c:512
+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"
++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
+msgid "only SHA-1 is supported for OCSP responses\n"
+msgstr "only SHA-1 is supported for OCSP responses\n"
+
+#: dirmngr/ocsp.c:468
+#, c-format
+msgid "allocating list item failed: %s\n"
+msgstr "allocating list item failed: %s\n"
+
+#: dirmngr/ocsp.c:483
+#, c-format
+msgid "error getting responder ID: %s\n"
+msgstr "error getting responder ID: %s\n"
+
+#: dirmngr/ocsp.c:518
+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
+#, c-format
+msgid "issuer certificate not found: %s\n"
+msgstr "issuer certificate not found: %s\n"
+
+#: dirmngr/ocsp.c:567
+msgid "caller did not return the target certificate\n"
+msgstr "caller did not return the target certificate\n"
+
+#: dirmngr/ocsp.c:574
+msgid "caller did not return the issuing certificate\n"
+msgstr "caller did not return the issuing certificate\n"
+
+#: dirmngr/ocsp.c:584
+#, c-format
+msgid "failed to allocate OCSP context: %s\n"
+msgstr "failed to allocate OCSP context: %s\n"
+
+#: dirmngr/ocsp.c:618
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "can't get authorityInfoAccess: %s\n"
+
+#: dirmngr/ocsp.c:625
+msgid "no default OCSP responder defined\n"
+msgstr "no default OCSP responder defined\n"
+
+#: dirmngr/ocsp.c:631
+msgid "no default OCSP signer defined\n"
+msgstr "no default OCSP signer defined\n"
+
+#: dirmngr/ocsp.c:638
+#, c-format
+msgid "using default OCSP responder '%s'\n"
+msgstr "using default OCSP responder ‘%s’\n"
+
+#: dirmngr/ocsp.c:643
+#, c-format
+msgid "using OCSP responder '%s'\n"
+msgstr "using OCSP responder ‘%s’\n"
+
+#: dirmngr/ocsp.c:650
+#, 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
+#, 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
+#, 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
+msgid "good"
+msgstr "good"
+
+#: dirmngr/ocsp.c:712
+#, 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
+msgid "OCSP responder returned a status in the future\n"
+msgstr "OCSP responder returned a status in the future\n"
+
+#: dirmngr/ocsp.c:759
+msgid "OCSP responder returned a non-current status\n"
+msgstr "OCSP responder returned a non-current status\n"
+
+#: dirmngr/ocsp.c:774
+msgid "OCSP responder returned an too old status\n"
+msgstr "OCSP responder returned an too old status\n"
+
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
++#, c-format
++msgid "failed to allocate assuan context: %s\n"
++msgstr "failed to allocate assuan context: %s\n"
++
++#: dirmngr/server.c:2430
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
+#, 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:2352
++#: dirmngr/server.c:2478
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
+#, 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
+msgid "selfsigned certificate has a BAD signature"
+msgstr "selfsigned certificate has a BAD signature"
+
+#: dirmngr/validate.c:565
+#, c-format
+msgid "checking trustworthiness of root certificate failed: %s\n"
+msgstr "checking trustworthiness of root certificate failed: %s\n"
+
+#: dirmngr/validate.c:742
+msgid "certificate chain is good\n"
+msgstr "certificate chain is good\n"
+
+#: dirmngr/validate.c:972
+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
+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:86 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:1248
+#, 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:1259 tools/gpg-connect-agent.c:1265
+#: tools/gpg-connect-agent.c:1271
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr "option “%s” ignored due to “%s”\n"
+
+#: tools/gpg-connect-agent.c:1369 tools/gpg-connect-agent.c:1864
+#, c-format
+msgid "receiving line failed: %s\n"
+msgstr "receiving line failed: %s\n"
+
+#: tools/gpg-connect-agent.c:1459
+msgid "line too long - skipped\n"
+msgstr "line too long - skipped\n"
+
+#: tools/gpg-connect-agent.c:1463
+msgid "line shortened due to embedded Nul character\n"
+msgstr "line shortened due to embedded Nul character\n"
+
+#: tools/gpg-connect-agent.c:1838
+#, c-format
+msgid "unknown command '%s'\n"
+msgstr "unknown command ‘%s’\n"
+
+#: tools/gpg-connect-agent.c:1856
+#, c-format
+msgid "sending line failed: %s\n"
+msgstr "sending line failed: %s\n"
+
+#: tools/gpg-connect-agent.c:2244
+#, 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:604 tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:756 tools/gpgconf-comp.c:852
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:769 tools/gpgconf-comp.c:875
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:646 tools/gpgconf-comp.c:713
+#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:882
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:811
+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"
+
+#: 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:694 tools/gpgconf-comp.c:771
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:697 tools/gpgconf-comp.c:774
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:700
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:918
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:728 tools/gpgconf-comp.c:920
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:731
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:734
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:783
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:786
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:816
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:865
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:901
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
- msgstr "Options controlling the use of TOR"
++msgid "Options controlling the use of Tor"
++msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:925
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:936
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:941
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:970
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:978
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1059
+msgid "GPG for OpenPGP"
+msgstr "GPG for OpenPGP"
+
+#: tools/gpgconf-comp.c:1060
+msgid "GPG Agent"
+msgstr "GPG Agent"
+
+#: tools/gpgconf-comp.c:1061
+msgid "Smartcard Daemon"
+msgstr "Smartcard Daemon"
+
+#: tools/gpgconf-comp.c:1062
+msgid "GPG for S/MIME"
+msgstr "GPG for S/MIME"
+
+#: tools/gpgconf-comp.c:1063
+msgid "Key Acquirer"
+msgstr "Key Acquirer"
+
+#: tools/gpgconf-comp.c:1064
+msgid "PIN and Passphrase Entry"
+msgstr "PIN and Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1178
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3236
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3387
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
+#: tools/gpgconf.c:65
+msgid "list all components"
+msgstr "list all components"
+
+#: tools/gpgconf.c:66
+msgid "check all programs"
+msgstr "check all programs"
+
+#: tools/gpgconf.c:67
+msgid "|COMPONENT|list options"
+msgstr "|COMPONENT|list options"
+
+#: tools/gpgconf.c:68
+msgid "|COMPONENT|change options"
+msgstr "|COMPONENT|change options"
+
+#: tools/gpgconf.c:69
+msgid "|COMPONENT|check options"
+msgstr "|COMPONENT|check options"
+
+#: tools/gpgconf.c:71
+msgid "apply global default values"
+msgstr "apply global default values"
+
+#: tools/gpgconf.c:73
+msgid "get the configuration directories for @GPGCONF@"
+msgstr "get the configuration directories for @GPGCONF@"
+
+#: tools/gpgconf.c:75
+msgid "list global configuration file"
+msgstr "list global configuration file"
+
+#: tools/gpgconf.c:77
+msgid "check global configuration file"
+msgstr "check global configuration file"
+
+#: tools/gpgconf.c:78
+msgid "reload all or a given component"
+msgstr "reload all or a given component"
+
+#: tools/gpgconf.c:79
+msgid "launch a given component"
+msgstr "launch a given component"
+
+#: tools/gpgconf.c:80
+msgid "kill a given component"
+msgstr "kill a given component"
+
+#: tools/gpgconf.c:84
+msgid "use as output file"
+msgstr "use as output file"
+
+#: tools/gpgconf.c:88
+msgid "activate changes at runtime, if possible"
+msgstr "activate changes at runtime, if possible"
+
+#: tools/gpgconf.c:110
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
+#: tools/gpgconf.c:113
+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:234 tools/gpgconf.c:268
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
+#: tools/gpgconf.c:243 tools/gpgconf.c:280 tools/gpgconf.c:313
+msgid "Component not found"
+msgstr "Component not found"
+
+#: tools/gpgconf.c:339
+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
+#, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s on %s aborted with status %i\n"
+
+#: tools/symcryptrun.c:288
+#, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "%s on %s failed with status %i\n"
+
+#: tools/symcryptrun.c:320
+#, 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
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "could not open %s for writing: %s\n"
+
+#: tools/symcryptrun.c:388
+#, c-format
+msgid "error writing to %s: %s\n"
+msgstr "error writing to %s: %s\n"
+
+#: tools/symcryptrun.c:395
+#, c-format
+msgid "error reading from %s: %s\n"
+msgstr "error reading from %s: %s\n"
+
+#: tools/symcryptrun.c:402 tools/symcryptrun.c:409
+#, c-format
+msgid "error closing %s: %s\n"
+msgstr "error closing %s: %s\n"
+
+#: tools/symcryptrun.c:494
+msgid "no --program option provided\n"
+msgstr "no --program option provided\n"
+
+#: tools/symcryptrun.c:500
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr "only --decrypt and --encrypt are supported\n"
+
+#: tools/symcryptrun.c:506
+msgid "no --keyfile option provided\n"
+msgstr "no --keyfile option provided\n"
+
+#: tools/symcryptrun.c:517
+msgid "cannot allocate args vector\n"
+msgstr "cannot allocate args vector\n"
+
+#: tools/symcryptrun.c:535
+#, c-format
+msgid "could not create pipe: %s\n"
+msgstr "could not create pipe: %s\n"
+
+#: tools/symcryptrun.c:542
+#, c-format
+msgid "could not create pty: %s\n"
+msgstr "could not create pty: %s\n"
+
+#: tools/symcryptrun.c:558
+#, c-format
+msgid "could not fork: %s\n"
+msgstr "could not fork: %s\n"
+
+#: tools/symcryptrun.c:586
+#, c-format
+msgid "execv failed: %s\n"
+msgstr "execv failed: %s\n"
+
+#: tools/symcryptrun.c:615
+#, c-format
+msgid "select failed: %s\n"
+msgstr "select failed: %s\n"
+
+#: tools/symcryptrun.c:632
+#, c-format
+msgid "read failed: %s\n"
+msgstr "read failed: %s\n"
+
+#: tools/symcryptrun.c:684
+#, c-format
+msgid "pty read failed: %s\n"
+msgstr "pty read failed: %s\n"
+
+#: tools/symcryptrun.c:736
+#, c-format
+msgid "waitpid failed: %s\n"
+msgstr "waitpid failed: %s\n"
+
+#: tools/symcryptrun.c:750
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr "child aborted with status %i\n"
+
+#: tools/symcryptrun.c:805
+#, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "cannot allocate infile string: %s\n"
+
+#: tools/symcryptrun.c:818
+#, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "cannot allocate outfile string: %s\n"
+
+#: tools/symcryptrun.c:993
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr "either %s or %s must be given\n"
+
+#: tools/symcryptrun.c:1020
+msgid "no class provided\n"
+msgstr "no class provided\n"
+
+#: tools/symcryptrun.c:1029
+#, 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.gmo
index 44cef12,0000000..026f932
mode 100644,000000..100644
Binary files differ
diff --cc po/eo.po
index b82887c,5439825..6adc283
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
"Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "nevalida pasfrazo
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -80,75 -68,59 +80,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "malbona pasfrazo"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "pasfrazo estas tro longa\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "pasfrazo estas tro longa\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Nevalida signo en nomo\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "malbona MPI"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "malbona pasfrazo"
@@@ -158,25 -129,11 +158,25 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -249,11 -193,9 +249,11 @@@ msgstr "Bonvolu doni la pasfrazon; tio
msgid "failed to create stream from socket: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -397,42 -313,28 +397,42 @@@ msgstr "
"Opcioj:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detala eligo"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -517,11 -402,6 +517,11 @@@ msgstr "ne realigita
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -537,143 -415,105 +537,142 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, fuzzy, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: agent/gpg-agent.c:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ne povas krei %s: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Valida atestilrevoko"
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: dosierujo kreita\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu �losiloj ignoritaj\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
@@@ -689,8 -527,6 +688,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -698,9 -534,6 +697,9 @@@ msgstr "
"@Komandoj:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -754,7 -579,6 +753,7 @@@ msgstr "nuligita de uzanto\n
msgid "error while asking for the passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -937,8 -727,6 +936,8 @@@ msgstr "eraro dum kreado de pasfrazo: %
msgid "error creating a stream for a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -1092,7 -848,6 +1091,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1111,7 -863,6 +1110,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1409,7 -1100,6 +1408,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "ne traktita"
@@@ -1595,19 -1247,14 +1594,19 @@@ msgstr "malsukcesis meti '%s' en fido-d
msgid "Enter passphrase: "
msgstr "Donu pasfrazon: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "sekreta �losilo ne havebla"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga re�imo\n"
@@@ -1622,222 -1267,171 +1621,222 @@@ msgstr "Tiu komando ne eblas en la re�i
msgid "Reset Code not or not anymore available\n"
msgstr "sekretaj �losilpartoj ne estas disponataj\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Via elekto? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "en"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "en"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "Nenia kialo specifita"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "ne traktita"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "skribas publikan �losilon al '%s'\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "aktualigitaj preferoj"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "nevalida signo en signo�eno\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "nevalida signo en signo�eno\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "Fingrospuro:"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita �is %u bitoj\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "ignorita: sekreta �losilo jam �eestas\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1845,155 -1439,120 +1844,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (nur �ifri)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Nevalida elekto.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Kialo por revoko: "
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "ignorita: sekreta �losilo jam �eestas\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "�u vere subskribi? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "forlasi �i tiun menuon"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "montri �i tiun helpon"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "Nenia helpo disponata"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "�an�i la daton de eksvalidi�o"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "�an�i la posedantofidon"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "montri fingrospuron"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "krei novan �losilparon"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Nevalida komando (provu per \"helpo\")\n"
@@@ -2001,77 -1559,63 +2000,83 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output ne funkcias por �i tiu komando\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "ne povas malfermi '%s'\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eraro dum legado de �losilbloko: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "�losilo '%s' ne trovita: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr ""
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "�losilo"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
msgid "subkey"
msgstr "al"
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr ""
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -2121,7 -1657,6 +2126,7 @@@ msgstr "NOTO: �ifrad-metodo %d ne trovi
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, 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"
@@@ -2203,287 -1722,240 +2208,307 @@@ msgstr "Averto: malsekura posedeco sur
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "neuzebla sekreta �losilo"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ignorita: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[Uzantidentigilo ne trovita]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "Fingrospuro:"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "�losilo '%s' ne trovita: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "nevalida kiraso"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "�ifri datenojn"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "kontroli subskribon"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "listigi �losilojn"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "listigi �losilojn kaj subskribojn"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "kontroli �losilsubskribojn"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "forigi �losilojn de la publika �losilaro"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "forigi �losilojn de la sekreta �losilaro"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "subskribi �losilon"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "subskribi �losilon loke"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "subskribi �losilon"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "subskribi �losilon loke"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "�an�i la pasfrazon"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "eksporti �losilojn"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "eksporti �losilojn al �losilservilo"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importi �losilojn de �losilservilo"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "ser�i �losilojn �e �losilservilo"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "aktualigi �iujn �losilojn de �losilservilo"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importi/kunfandi �losilojn"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOMO|�ifri por NOMO"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr ""
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2491,7 -1963,6 +2516,7 @@@ msgstr "
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2511,13 -1982,11 +2536,13 @@@ msgstr "
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2532,7 -2001,6 +2557,7 @@@ msgstr "
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2540,597 -2008,523 +2565,662 @@@ msgstr "
"\n"
"Realigitaj metodoj:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uzado: gpg [opcioj] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr ""
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "montri, en kiu �losilaro estas listigita �losilo"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "mal�alti �losilon"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "nekonata implicita ricevonto '%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "nekonata implicita ricevonto '%s'\n"
+
++#: g10/gpg.c:2085
#, fuzzy, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
- #: g10/gpg.c:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTO: %s ne estas por normala uzado!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "nevalida kompendi-metodo '%s'\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "nevalida kompendi-metodo '%s'\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [dosiero]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [dosiero]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key uzantidentigilo"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "eraro dum kreado de pasfrazo: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[dosiero]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "malkongruo de tempostampoj"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3303,7 -2663,6 +3393,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
@@@ -3313,7 -2671,6 +3403,7 @@@
msgid "key %s: %s\n"
msgstr "ignoris '%s': %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3336,7 -2689,6 +3426,7 @@@ msgstr "�losilo %08lX: mankas valida uz
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
@@@ -3346,257 -2697,220 +3436,272 @@@
msgid "key %s: new key - skipped\n"
msgstr "�losilo %08lX: nova �losilo - ignorita\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "neniu skribebla �losilaro trovita: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "skribas al '%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "�losilo %08lX: publika �losilo importita\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "�losilo %08lX: diferencas de nia kopio\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "�losilo %08lX: 1 nova subskribo\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "�losilo %08lX: 1 nova sub�losilo\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "�losilo %08lX: ne �an�ita\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "�losilo %08lX: sekreta �losilo importita\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "�losilo %08lX: revokatestilo importita\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
- #: g10/import.c:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "�losilo %08lX: ignoris uzantidentigilon '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "�losilo %08lX: ignoris sub�losilon\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
@@@ -3623,61 -2933,52 +3728,66 @@@ msgstr "�losilaro '%s' kreita\n
msgid "keyring '%s' created\n"
msgstr "�losilaro '%s' kreita\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "eraro dum legado de '%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[revoko]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[mem-subskribo]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 malbona subskribo\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d malbonaj subskriboj\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 subskribo ne kontrolita pro eraro\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3690,64 -2991,54 +3800,69 @@@ msgstr "
"kontrolante fingrospurojn el diversaj fontoj ...)?\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Mi fidas iomete\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Mi plene fidas\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, fuzzy, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
#, fuzzy
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr ""
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "�u vere subskribi? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, fuzzy, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3758,7 -3049,6 +3873,7 @@@ msgstr "
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
#, fuzzy
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
@@@ -3767,7 -3057,6 +3882,7 @@@
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3778,12 -3067,10 +3893,12 @@@ msgstr "
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
#, fuzzy
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3794,7 -3081,6 +3909,7 @@@ msgstr "
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
#, fuzzy
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
@@@ -3803,41 -3089,33 +3918,41 @@@
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
#, fuzzy
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nenio por subskribi per �losilo %08lX\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "�i tiu �losilo eksvalidi�is!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
#, fuzzy
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3846,32 -3124,26 +3961,32 @@@ msgstr "
"Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
"al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Mi ne respondas.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Mi tute ne kontrolis.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Mi malzorge kontrolis.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Mi tre zorge kontrolis.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr " i = bonvolu montri pli da informoj\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3880,268 -3152,213 +3995,268 @@@ msgstr "
"�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
"per via �losilo: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel neeksportebla.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel neeksportebla.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Mi tute ne kontrolis �i tiun �losilon.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Mi malzorge kontrolis �i tiun �losilon.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Mi tre zorge kontrolis �i tiun �losilon.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "�u vere subskribi? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "movas �losilsubskribon al la �usta loko\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "skribi kaj fini"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "montri fingrospuron"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Subskribo-notacio: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "listigi �losilojn kaj uzantidentigilojn"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "elekti uzantidentigilon N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "elekti uzantidentigilon N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "revoki subskribojn"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "subskribi la �losilon loke"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "aldoni uzantidentigilon"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "aldoni foto-identigilon"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "forvi�i uzantidentigilon"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "al"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "forvi�i flankan �losilon"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
#, fuzzy
msgid "add a revocation key"
msgstr "aldoni flankan �losilon"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marku uzantidentigilon kiel �efan"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "listigi preferojn (spertula)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "listigi preferojn (detale)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "�an�i la pasfrazon"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "�an�i la posedantofidon"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "aldoni uzantidentigilon"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoki flankan �losilon"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "�alti �losilon"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "mal�alti �losilon"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "montri foto-identigilon"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Sekreta �losilo estas havebla.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Bezonas la sekretan �losilon por fari tion.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4149,302 -3366,237 +4264,302 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
#, fuzzy
msgid "Key is revoked."
msgstr "�losilo estas revokita.\n"
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "�u vere subskribi �iujn uzantidentigilojn? "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "�u vere subskribi �iujn uzantidentigilojn? "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "nekonata klaso de subskribo"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Vi devas elekti almena� unu �losilon.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Vi devas elekti almena� unu �losilon.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "�u vi vere volas revoki �i tiun �losilon? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "�u vi vere volas revoki �i tiun �losilon? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "agordi liston de preferoj"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "�u vere aktualigi la preferojn? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "�u skribi �an�ojn? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "�u fini sen skribi �an�ojn? "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Uzantidentigilo ne ekzistas.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nenio por subskribi per �losilo %08lX\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr ""
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr ""
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Notacio: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (sentema)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "ne povas krei %s: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "rev"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [eksvalidi�os: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [eksvalidi�os: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " fido: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fido: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "�i tiu �losilo estas mal�altita"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "rev"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "eksval"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4453,79 -3605,62 +4568,79 @@@ msgstr "
"AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
" ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
#, fuzzy
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Forvi�is %d subskribon.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Forvi�is %d subskribojn.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Nenio estis forvi�ita.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "nevalida"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
#, fuzzy
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
@@@ -4535,198 -3670,163 +4650,205 @@@ msgstr "
"AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
" ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
#, fuzzy
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Donu la �losilgrandon"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Subskribo-notacio: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�u surskribi (j/N)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Mankas uzantidentigilo kun indekso %d\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "uzantidentigilo: \""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " subskribita per %08lX je %s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr ""
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
#, fuzzy
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " subskribita per %08lX je %s%s\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr "subskribi �losilon nerevokeble"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokita de %08lX je %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Vi revokos la sekvajn subskribojn:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "�u vere krei la revokatestilojn? (j/N)"
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "mankas sekreta �losilo\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4769,14 -3861,10 +4891,14 @@@ msgstr "skribas mem-subskribon\n
msgid "writing key binding signature\n"
msgstr "skribas �losilbindan subskribon\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "�losilgrando nevalida; uzas %u bitojn\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "�losilgrando rondigita �is %u bitoj\n"
@@@ -5073,41 -4112,36 +5195,46 @@@ msgstr "
msgid "Real name: "
msgstr "Vera nomo: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komenci�i per cifero\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almena� 5 signojn\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Retadreso: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Komento: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5118,7 -4152,6 +5245,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
@@@ -5133,35 -4166,28 +5260,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5169,23 -4195,19 +5296,23 @@@ msgstr "
"Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5197,7 -4219,6 +5324,7 @@@ msgstr "
"uzante �i tiun programon kun la opcio \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5209,12 -4230,10 +5336,12 @@@ msgstr "
"kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
"akiri sufi�e da entropio.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5222,56 -4241,45 +5349,56 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "'%s' jam densigita\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
msgid "creating anyway\n"
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Kreado de �losiloj nuligita.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "skribas publikan �losilon al '%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "neniu skribebla publika �losilaro trovita: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5280,7 -4288,6 +5407,7 @@@ msgstr "
"Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
"uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5288,7 -4295,6 +5415,7 @@@ msgstr "
"�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5296,254 -4302,202 +5423,254 @@@ msgstr "
"�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "�u vere krei? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr ""
- #: g10/keylist.c:309
++#: g10/keylist.c:331
#, fuzzy
msgid "Critical signature policy: "
msgstr "Subskribo-gvidlinioj: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Subskribo-gvidlinioj: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
#, fuzzy
msgid "Critical signature notation: "
msgstr "Subskribo-notacio: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Subskribo-notacio: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 malbona subskribo\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d malbonaj subskriboj\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "�losilaro"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ignoris '%s': %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "listigi �losilojn kaj fingro�purojn"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " �losilo-fingrospuro ="
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " �losilo-fingrospuro ="
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " �losilo-fingrospuro ="
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " �losilo-fingrospuro ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrolas �losilaron '%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: �losilaro kreita\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "el"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "nevalida �losilaro"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: ne valida �losilidentigilo\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"subskribita per via �losilo %08lX je %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
@@@ -5577,7 -4525,6 +5704,7 @@@ msgstr "publik�losile �ifritaj datenoj
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alinome \""
@@@ -5625,258 -4563,206 +5752,258 @@@ msgstr "mal�ifrado sukcesis\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "originala dosiernomo='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "MALBONA subskribo de \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Eksvalidi�inta subskribo de \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "kontrolo de subskribo estas mal�altita\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alinome \""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
#, fuzzy
msgid "Key available at: "
msgstr "Nenia helpo disponata"
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[malcerta]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alinome \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
#, fuzzy
msgid "binary"
msgstr "�efa"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
#, fuzzy
msgid "unknown"
msgstr "nekonata versio"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "nekonata publik�losila metodo"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Ne povas kontroli subskribon: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "ne aparta subskribo\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "memstara subskribo de klaso 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "malnovstila subskribo (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "ne povas trakti publik�losilan metodon %d\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "nerealigita �ifrad-metodo"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, fuzzy, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
#, fuzzy
msgid "Uncompressed"
msgstr "ne traktita"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "ne traktita"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, fuzzy, c-format
msgid "this message may not be usable by %s\n"
msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "legas opciojn el '%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "nekonata klaso de subskribo"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6064,32 -4917,25 +6191,32 @@@ msgstr "�u tio estas �usta (j/n)?
msgid "unable to display photo ID!\n"
msgstr "ne povas malfermi %s: %s\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Nenia kialo specifita"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "�losilo estas anstata�igita."
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "�losilo estas kompromitita"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "�losilo estas ne plu uzata"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Uzantidentigilo ne plu validas"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
#, fuzzy
msgid "reason for revocation: "
msgstr "Kialo por revoko: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
#, fuzzy
msgid "revocation comment: "
msgstr "Komento pri revoko: "
@@@ -6104,100 -4950,81 +6231,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMfFsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Nenia fidovaloro atribuita al:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alinome \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Ne scias\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Ni NE fidas �i tiun �losilon\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Mi fidas absolute\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = reen al la �efmenuo\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = supersalti �i tiun �losilon\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " f = fini\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Via decido? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "�u vi vere volas �an�i �i tiun �losilon al absoluta fido? "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "�i tiu �losilo apartenas al ni\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6209,116 -5036,91 +6336,116 @@@ msgstr "
"la sekva demando per \"jes\"\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "AVERTO: Uzas nefidatan �losilon!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
#, 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:546
++#: g10/pkclist.c:547
#, 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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Tio povas signifi, ke la subskribo estas falsa.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " La subskribo ver�ajne estas FALSA.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorita: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorita: publika �losilo jam �eestas\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6326,75 -5128,58 +6453,75 @@@ msgstr "
"\n"
"Donu la uzantidentigilon. Finu per malplena linio: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Uzantidentigilo ne ekzistas.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Publika �losilo estas mal�altita.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "ignorita: publika �losilo jam agordita\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "mankas validaj adresitoj\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Aparta subskribo.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Bonvolu doni la nomon de la dosiero: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "legas la normalan enigon ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "mankas subskribitaj datenoj\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
@@@ -6432,8 -5210,6 +6559,8 @@@ msgstr "NOTO: sekreta �losilo %08lX eks
msgid "Note: key has been revoked"
msgstr "�losilo %08lX: �losilo estas revokita!\n"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, fuzzy, c-format
msgid "build_packet failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
@@@ -6443,44 -5218,40 +6570,50 @@@
msgid "key %s has no user IDs\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr ""
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr ""
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Sekreta �losilo estas havebla.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr ""
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, fuzzy, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "listigo de �losilblokoj malsukcesis: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
#, fuzzy
msgid "Revocation certificate created.\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6488,19 -5259,27 +6621,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "�losilo '%s' ne trovita: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6511,37 -5290,30 +6657,37 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:703
++#: g10/revoke.c:763
#, fuzzy
msgid "Please select the reason for the revocation:\n"
msgstr "Kialo por revoko: "
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:756
++#: g10/revoke.c:816
#, fuzzy
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"\n"
"Donu la uzantidentigilon. Finu per malplena linio: "
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, fuzzy, c-format
msgid "Reason for revocation: %s\n"
msgstr "Kialo por revoko: "
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "�u tamen uzi �i tiun �losilon? "
@@@ -6566,36 -5334,29 +6712,36 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr ""
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = bonvolu montri pli da informoj\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6603,7 -5364,6 +6749,7 @@@ msgstr "
"�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6611,27 -5371,22 +6757,27 @@@ msgstr "
"�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "�losilo %08lX: �losilo estas revokita!\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
@@@ -6675,34 -5424,28 +6821,34 @@@ msgstr "NOTO: �ifrad-metodo %d ne trovi
msgid "signing:"
msgstr "subskribas:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s �ifrado estos aplikata\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
"stokastilo!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ignoris '%s': ripetita\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "ignorita: sekreta �losilo jam �eestas\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"ignoris '%s': �i tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
"por subskribado!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@@ -6748,7 -5483,6 +6894,7 @@@ msgstr "eraro dum legado de dosieruja r
msgid "read error in '%s': %s\n"
msgstr "kiraso: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "fido-datenaro: sync malsukcesis: %s\n"
@@@ -6777,7 -5506,6 +6923,7 @@@ msgstr "fido-datenaro loko %lu: skribo
msgid "trustdb transaction too large\n"
msgstr "fido-datenaro-transakcio tro granda\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
@@@ -6893,119 -5598,95 +7039,119 @@@ msgstr "ne povas trakti tekstliniojn pl
msgid "input line longer than %d characters\n"
msgstr "enigata linio pli longa ol %d signojn\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s' ne estas valida longa �losilidentigilo\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "�losilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "�losilo markita kiel absolute fidata.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "fido-registro %lu ne havas petitan specon %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "sekva kontrolo de fido-datenaro je %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "publika �losilo %08lX ne trovita: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr ""
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "kontrolas la fido-datenaron\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr ""
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
#, fuzzy
msgid "no ultimately trusted keys found\n"
msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@@ -7241,11 -5873,9 +7387,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7386,12 -5988,10 +7532,12 @@@ msgstr "%s-subskribo de: %s\n
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@@ -7413,7 -6010,6 +7559,7 @@@ msgstr "Donu la uzantidentigilon:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7473,12 -6057,10 +7619,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7922,7 -6412,6 +8068,7 @@@ msgstr "eraro dum kreado de �losilaro '
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8518,7 -6887,6 +8664,7 @@@ msgstr "Nevalida atestilo
msgid " runtime cached certificates: %u\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
@@@ -8528,8 -6895,6 +8674,8 @@@
msgid "certificate cached\n"
msgstr "Valida atestilrevoko"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -8590,7 -6944,6 +8736,7 @@@ msgstr "forvi�o de �losilbloko malsukce
msgid "not removing file '%s'\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -8813,219 -7122,176 +8959,219 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr ""
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "converting S-expression failed: %s\n"
msgstr "�an�o de permesoj de '%s' malsukcesis: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "creating S-expression failed: %s\n"
msgstr "�an�o de permesoj de '%s' malsukcesis: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
msgid "ksba_crl_parse failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "skribas al '%s'\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "Bona atestilo"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "kontrolo de subskribo estas mal�altita\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "lid ?: insert failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "lid ?: en�ovo malsukcesis: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "skribas al '%s'\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
msgid " WARNING: invalid cache record length\n"
msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: eraro dum legado de libera registro: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? problemo en kontrolo de revoko: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
#| msgid "lid ?: insert failed: %s\n"
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "lid ?: en�ovo malsukcesis: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
@@@ -9071,76 -7327,60 +9217,76 @@@ msgstr "eraro dum kreado de '%s': %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "eraro dum legado de '%s': %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "�losilo '%s' ne trovita: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
#| msgid "bad certificate"
msgid "validate a certificate"
msgstr "malbona atestilo"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
#| msgid "bad certificate"
msgid "lookup a certificate"
msgstr "malbona atestilo"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "Nevalida atestilo"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "Bona atestilo"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
msgid "force the use of the default OCSP responder"
msgstr "Donu la �losilgrandon"
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9148,226 -7388,155 +9294,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "ne povas konekti�i al '%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "Valida atestilrevoko"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "�losilo %08lX: �losilo estas revokita!\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "ne povas stat-i '%s': %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: malsukcesis krei haktabelon: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "ne povas konekti�i al '%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Realigitaj metodoj:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "�u fini sen skribi �an�ojn? "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9380,91 -7549,72 +9499,91 @@@ msgstr "
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uzado: gpg [opcioj] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "pasfrazo estas tro longa\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "kiraso: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "ne traktita"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9713,12 -7812,10 +9832,12 @@@ msgstr "ser�as pri \"%s\" �e HKP-servil
msgid "malloc failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9753,11 -7844,10 +9872,12 @@@ msgstr "eraro dum legado de '%s': %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "�losilo '%s' ne trovita: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9905,72 -7965,61 +10025,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s: malsukcesis krei haktabelon: %s\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10227,11 -8216,9 +10352,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/es.gmo
index b92388a,0000000..ec80f44
mode 100644,000000..100644
Binary files differ
diff --cc po/es.po
index bc8b7c1,532323b..ed6b48e
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2015-10-09 17:10+0200\n"
"Last-Translator: Jaime Su�rez <jaime.suma at gmail.com>\n"
"Language-Team: Spanish <es at li.org>\n"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "frase contrase�a incorrecta
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Calidad:"
@@@ -88,18 -76,15 +88,18 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr "barra de calidad, entrada de pin"
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
"Por favor introduzca su PIN para desbloquear la clave secreta de esta sesi�n"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -107,7 -92,6 +107,7 @@@ msgstr "
"Por favor introduzca la frase contrase�a para desbloquear la clave secreta "
"de esta sesi�n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
@@@ -120,45 -104,34 +120,45 @@@
# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
# �Es que son m�s listos? :-)
#
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Frase contrase�a:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "no coincide - reint�ntelo"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (intento %d de %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "PIN demasiado largo"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Frase contrase�a demasiado larga"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "Caracteres inv�lidos en el PIN"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "PIN demasiado corto"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "PIN incorrecto"
@@@ -171,7 -144,6 +171,7 @@@
# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
# �Es que son m�s listos? :-)
#
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Frase contrase�a err�nea"
@@@ -180,25 -151,11 +180,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -279,11 -223,9 +279,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "fallo al crear un flujo desde el socket: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "Por favor inserte la tarjeta con n�mero de serie"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "Por favor retire tarjeta actual e inserte la que tiene n�mero de serie"
@@@ -443,41 -359,27 +443,41 @@@ msgstr "
"@Opciones:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "ejecutar en modo demonio (segundo plano)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "ejecutar en modo servidor (primer plano)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolijo"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "algo m�s discreto"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "salida de datos estilo sh"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "salida de datos estilo csh"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "no independizarse de la consola"
@@@ -562,11 -447,6 +562,11 @@@ msgstr "no disponible
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -588,152 -466,114 +588,151 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, 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:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "no se puede crear el socket: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, 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:1750
++#: agent/gpg-agent.c:1735
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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "error obteniendo valor �nico para el socket\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, 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:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() fall�: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, 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:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 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:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error leyendo valor �nico en el descriptor %d: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "manejador 0x%lx para descriptor %d iniciado\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, 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:2288
++#: agent/gpg-agent.c:2273
#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, 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:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s detenido\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "no hay un agente gpg ejecut�ndose en esta sesi�n\n"
@@@ -753,8 -591,6 +752,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:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -762,9 -598,6 +761,9 @@@ msgstr "
"@�rdenes:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -818,7 -643,6 +817,7 @@@ msgstr "cancelado\n
msgid "error while asking for the passphrase: %s\n"
msgstr "error pidiendo la frase contrase�a: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -1017,8 -807,6 +1016,8 @@@ msgstr "error creando tuber�a: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "error creando tuber�a: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "error bifurcando procesos: %s\n"
@@@ -1173,7 -929,6 +1172,7 @@@ msgstr "no hay gpg-agent en ejecuci�n
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "esperando %d segundos para que el agente arranque\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1195,7 -947,6 +1194,7 @@@ msgstr "no hay dirmngr en ejecuci�n - i
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "esperando %d segundos para que el agente arranque\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1459,7 -1150,6 +1458,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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "memoria desbordada\n"
@@@ -1643,19 -1295,14 +1642,19 @@@ msgstr "fallo al hacer la petici�n prox
msgid "Enter passphrase: "
msgstr "Introduzca frase contrase�a: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "tarjeta OpenPGP no disponible: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "tarjeta OpenPGP num. %s detectada\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
@@@ -1667,156 -1312,117 +1666,156 @@@ msgstr "Esta orden solo est� disponibl
msgid "Reset Code not or not anymore available\n"
msgstr "No hay C�digo de Reinicio o ya no est� disponible\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Su elecci�n: "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[no establecido]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "hombre"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "mujer"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "no especificado"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "no forzado"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "forzado"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Error: El caracter \"<\" no puede usarse.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Error: no se permiten dobles espacios.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Apellido del titular de la tarjeta: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Nombre del titular de la tarjeta: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Error: nombre combinado demasiado largo (m�ximo %d caracteres).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "URL de donde recuperar la clave p�blica: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "error reservando memoria: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "error leyendo `%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "error escribiendo `%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Datos de login (nombre de la cuenta): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Datos privados: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
"Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Preferencias de idioma: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Error: respuesta no v�lida.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "Huella dactilar CA:"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Error: formato inv�lido de huella dactilar.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "la operaci�n con la clave no es posible: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "no es una tarjeta OpenPGP"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "�Reemplazar la clave existente? (s/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1831,58 -1437,46 +1830,58 @@@ msgstr "
" requerido. Si la generaci�n de clave fracasa, por favor compruebe\n"
" la documentaci�n de su tarjeta para ver los tama�os posibles.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "�De qu� tama�o quiere la clave de Firmado? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "�De qu� tama�o quiere la clave de Cifrado? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "�De qu� tama�o quiere la clave de Autenticaci�n? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Ahora la tarjeta se reconfigurar� para generar una clave de %u bits\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "error cambiando el tama�o de la clave %d a %u bits: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "NOTA: �claves ya almacenadas en la tarjeta!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "�Reemplazar las claves existentes? (s/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1897,145 -1491,110 +1896,145 @@@ msgstr "
" PIN = `%s' PIN Administrador = `%s'\n"
"Deber�a cambiarlos usando la orden --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Por favor seleccione tipo de clave que generar:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Clave de firmado\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Clave de cifrado\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Clave de autentificaci�n\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Elecci�n inv�lida.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Por favor elija donde guardar la clave:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "lectura fallida: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Esta orden no se permite en modo %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "NOTA: �claves ya almacenadas en la tarjeta!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "�Firmarlo? (s/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "sale de este men�"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "ver �rdenes de administrador"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "muestra esta ayuda"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "listar todos los datos disponibles"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "cambiar el nombre del titular de la tarjeta"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "cambiar URL de donde obtener la clave"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "recuperar la clave especificada en la URL de la tarjeta"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "cambiar nombre de usuario"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "cambiar preferencias de idioma"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "cambiar sexo del titular de la tarjeta"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "cambiar huella dactilar de una CA"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "cambiar estado de la opci�n forzar firma del PIN"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "generar nuevas claves"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "men� para cambiar o desbloquear el PIN"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "verificar PIN y listar todos los datos"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "desbloquear PIN usando C�digo de Reinicio"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/tarjeta> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "�rdenes s�lo de administrador\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Se permiten �rdenes de administrador\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "No se permiten �rdenes de administrador\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Orden inv�lida (pruebe \"help\")\n"
@@@ -2043,76 -1601,63 +2042,83 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona con esta orden\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, 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:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clave \"%s\" no encontrada: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "error leyendo bloque de claves: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "clave \"%s\" no encontrada: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(excepto si especifica la clave dando su huella digital)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "�Eliminar esta clave del anillo? (s/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "�Es una clave secreta! �Eliminar realmente? (s/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "deleting secret %s failed: %s\n"
msgstr "borrado del certificado \"%s\" fallido: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "clave"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Clave p�blica: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "borrado de bloque de anillo de claves fallido: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "borrada informaci�n de propietarios\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creando frase contrase�a: %s\n"
@@@ -2168,7 -1705,6 +2174,7 @@@ msgstr "
"forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
"del destinatario\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "no puede usar %s en modo %s\n"
@@@ -2257,269 -1777,224 +2263,290 @@@ msgstr "AVISO: no se puede borrar fiche
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "exportar firmas marcadas como s�lo locales"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exportar el atributo ID de usuario (generalmente fotogr�fico)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "exportar claves de revocaci�n marcadas como \"confidenciales\""
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "borrar partes inutilizables de la clave al exportar"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "borrar tanto como sea posible de la clave al exportar"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "no se permite exportar claves secretas\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "clave %s: material de la clave en la tarjeta - omitida\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "ATENCI�N: no se ha exportado nada\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[ID de usuario no encontrado]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "recuperado autom�ticamente `%s' v�a %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "error recuperando `%s' v�a %s: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "No hay huella dactilar"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "clave secreta \"%s\" no encontrada: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "falta par�metro para la opci�n \"%.50s\"\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "usando subclave %s en vez de clave primaria %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "crea una firma"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "crea una firma en texto claro"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "crea una firma separada"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "cifra datos"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "lista claves"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "lista claves y firmas"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "lista y comprueba firmas de las claves"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "lista claves secretas"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "elimina claves del anillo p�blico"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "elimina claves del anillo privado"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "cambia una frase contrase�a"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "exporta claves"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "exporta claves a un servidor de claves"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importa claves desde un servidor de claves"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "busca claves en un servidor de claves"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "actualiza todas las claves desde un servidor de claves"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importa/fusiona claves"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "escribir estado de la tarjeta"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "cambiar datos en la tarjeta"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "cambiar el PIN de la tarjeta"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "imprime res�menes de mensaje"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "ejecutar en modo servidor"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID-USUARIO|cifra para ID-USUARIO"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivel de compresi�n N (0 desactiva)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|FICHERO|volcar salida en FICHERO"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "no hace ning�n cambio"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "preguntar antes de sobreescribir"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "usar estilo OpenPGP estricto"
@@@ -2527,7 -2002,6 +2554,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:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2535,7 -2009,6 +2562,7 @@@ msgstr "
"@\n"
"(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2555,13 -2028,11 +2582,13 @@@ msgstr "
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2576,7 -2047,6 +2603,7 @@@ msgstr "
"firma, comprueba, cifra o descifra\n"
"la operaci�n por defecto depende de los datos de entrada\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2584,81 -2054,66 +2611,81 @@@ msgstr "
"\n"
"Algoritmos disponibles:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Clave p�blica: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Cifrado: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Resumen: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Compresi�n: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "uso: gpgsm [opciones] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "�rdenes incompatibles\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2668,20 -2123,17 +2695,20 @@@ msgstr "
"AVISO: propiedad insegura del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2692,455 -2144,415 +2719,527 @@@ msgstr "
"AVISO: permisos inseguros del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, 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:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "mostrar foto IDs al listar claves"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, 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:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "mostrar URLS de pol�tica al listar firmas"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "mostrar todas las notaciones al listar firmas"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "mostrar notaciones est�ndar IETF al listar firmas"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "mostrar notaciones personalizadas al listar firmas"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr "mostrar URL del servidor de claves preferido al listar firmas"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "mostrar validez de la ID de usuario al listar claves"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "mostrar subclaves revocadas y expiradas al listar claves"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "mostrar nombre de los anillos de claves al listar claves"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "mostrar fechas de caducidad al listar firmas"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "Claves disponibles:\n"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option `%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "opci�n desconocida `%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command `%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "orden desconocida `%s'\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "la opci�n \"%.50s\" es ambigua\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "error escribiendo anillo `%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: �%s no es para uso normal!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, 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:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "opciones del servidor de claves inv�lidas\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "opciones de importaci�n inv�lidas\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "opciones de exportaci�n inv�lidas\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: lista de opciones inv�lida\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "lista de opciones inv�lida\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "mostrar foto IDs al verificar firmas"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "mostrar URLs de pol�tica al verificar firmas"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "mostrar todas las notaciones al verificar firmas"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "mostrar notaciones personalizadas al verificar firmas"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "mostrar validez del ID de usuario al verificar firmas"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr "mostrar solo ID primario de usuario al verificar firmas"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "validar firmas con datos PKA"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "opciones de verificaci�n inv�lidas\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer camino de ejecutables %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, 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:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "lista de auto-localizaci�n de claves inv�lida\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sustituye a %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s no permitido con %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s no tiene sentido con %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "no se ejecutar� en memoria insegura por %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferencias por defecto inv�lidas\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inv�lidas\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresi�n inv�lidas\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s a�n no funciona con %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, 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:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, 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/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, 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:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nombre_fichero]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
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:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
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:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nombre_fichero]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [�rdenes]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd <id-usuario>"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "env�o al servidor de claves fallido: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepci�n del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "exportaci�n de clave fallida: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "b�squeda del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "renovaci�n al servidor de claves fallida: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, 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:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[nombre_fichero]"
@@@ -3148,39 -2560,30 +3247,39 @@@
# 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:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "URL de pol�tica de certificado inv�lida\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "URL de pol�tica inv�lida\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL del servidor de claves preferido no es v�lida\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|FICHERO|tomar las claves del anillo FILE"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3359,7 -2728,6 +3458,7 @@@ msgid "you can update your preferences
msgstr ""
"puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "clave %s: sin identificador de usuario\n"
@@@ -3370,7 -2737,6 +3469,7 @@@
msgid "key %s: %s\n"
msgstr "omitido \"%s\": %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3393,7 -2755,6 +3492,7 @@@ msgstr "clave %s: sin identificadores d
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clave %s: clave p�blica no encontrada: %s\n"
@@@ -3403,261 -2763,224 +3502,276 @@@
msgid "key %s: new key - skipped\n"
msgstr "clave %s: clave nueva - omitida\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "anillo de claves no escribible encontrado: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "escribiendo en `%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clave %s: clave p�blica \"%s\" importada\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clave %s: no coincide con nuestra copia\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clave %s: \"%s\" 1 firma nueva\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clave %s: \"%s\" %d firmas nuevas\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clave %s: \"%s\" 1 subclave nueva\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clave %s: \"%s\" sin cambios\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clave %s: clave secreta importada\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, 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:1663
++#: g10/import.c:1680
#, 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:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "no se permite importar claves secretas\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clave %s: firma directa de clave inv�lida\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clave %s: uni�n de subclave inv�lida\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clave %s: revocaci�n de subclave inv�lida\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clave %s: omitido ID de usuario \"%s\"\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clave %s: subclave omitida\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clave %s: detectado usuario duplicado - fusionada\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clave %s: firma directa de clave a�adida\n"
@@@ -3686,62 -3005,54 +3800,68 @@@ msgstr "caja de claves `%s' creada\n
msgid "keyring '%s' created\n"
msgstr "anillo `%s' creado\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "recurso de bloque de claves: `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening `%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "error abriendo `%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[revocaci�n]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[autofirma]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 firma incorrecta\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d firmas incorrectas\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 firma no comprobada por falta de clave\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d firmas no comprobadas por falta de clave\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 firma no comprobada por causa de un error\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d firmas no comprobadas por errores\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3753,17 -3064,14 +3873,17 @@@ msgstr "
"pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Conf�o un poco\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Conf�o totalmente\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3773,45 -3081,38 +3893,50 @@@ msgstr "
"Un nivel mayor que 1 permite que la clave que est� firmando pueda\n"
"hacer firmas de confianza en su nombre.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID de usuario \"%s\" revocado."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Imposible firmar.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID de usuario \"%s\" expirado."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID de usuario \"%s\" no tiene autofirma."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID de usuario \"%s\" puede firmarse."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "�Firmarlo? (s/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3820,11 -3121,9 +3945,11 @@@ msgstr "
"La autofirma en \"%s\"\n"
"es una firma de tipo PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3833,11 -3132,9 +3958,11 @@@ msgstr "
"Su firma actual en \"%s\"\n"
"ha expirado.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3846,43 -3143,34 +3971,43 @@@ msgstr "
"Su firma actual en \"%s\"\n"
"es una firma local.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ya estaba firmada por la clave %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�Quiere firmarlo a�n as�? (s/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que firmar con la clave %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "�Esta clave ha caducado!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta clave expirar� el %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3892,33 -3180,27 +4017,33 @@@ msgstr "
"firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
"contestar, introduzca \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No contesto.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) No lo he comprobado en absoluto.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He hecho una comprobaci�n informal.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Lo he comprobado meticulosamente.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3927,227 -3209,172 +4052,227 @@@ msgstr "
"�Est� realmente seguro de querer firmar esta clave\n"
"con su clave: \"%s\" (%s)?\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Esto ser� una autofirma.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "AVISO: la firma no se marcar� como no revocable.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "La firma se marcar� como no exportable.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "La firma se marcar� como no revocable.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "No he comprobado esta clave en absoluto.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "He comprobado esta clave informalmente.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "He comprobado esta clave meticulosamente.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "�Firmar de verdad? (s/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
"- no hay frase contrase�a que cambiar.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "error creando frase contrase�a: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "moviendo la firma de la clave al lugar correcto\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "graba y sale"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "muestra huella dactilar de la clave"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Introduzca keygrip: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "lista clave e identificadores de usuario"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "selecciona identificador de usuario N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "selecciona subclave N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "comprueba firmas"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "firma localmente los IDs de usuarios elegidos"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "firmar IDs seleccionados con firma de confianza"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "firmar IDs seleccionados con firma no revocable"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "a�adir un identificador de usuario"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "a�adir un ID fotogr�fico"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "borrar identificadores de usuario seleccionados"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "a�adir una subclave"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "a�adir clave a tarjeta"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "mover una clave a la tarjeta"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "mover una clave de respaldo a la tarjeta"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "borrar clave secundaria"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "a�adir una clave de revocaci�n"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "borrar firmas de los ID seleccionados"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "marcar ID de usuario seleccionado como primario"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "mostrar preferencias (experto)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "mostrar preferencias (prolijo)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "establecer preferencias para todos los ID seleccionados"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "establecer URL del servidor de claves preferido por los IDs elegidos"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "establecer notaci�n para los IDs de usuario seleccionados"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "cambia la frase contrase�a"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "cambia valores de confianza"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "revocar firmas de los identificadores seleccionados"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "revocar los identificadores seleccionados"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "revoca clave o subclaves seleccionadas"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "habilita clave"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "deshabilita clave"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "mostrar fotos de los ID seleccionados"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "compactar IDs inutilizables y borrar firmas inutilizables de la clave"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "compactar IDs inutilizables y borrar todas las firmas de la clave"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Clave secreta disponible.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Se necesita la clave secreta para hacer esto.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4165,257 -3392,201 +4290,258 @@@ msgstr "
"locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
"revocables (nrsign) o cualquier combinaci�n de ellas (ltsign, tnrsign, etc)\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "La clave est� revocada."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Clase de firma desconocida `%s'\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Esta orden no se permite en modo %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "�Borrar realmente este identificador de usuario? (s/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "�Realmente cambiar de sitio la clave primaria? (s/N)"
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Debe seleccionar exactamente una clave.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "La orden espera un nombre de fichero como argumento\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "No se puede abrir `%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar por lo menos una clave.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "�De verdad quiere borrar esta clave? (s/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "�Revocar realmente este identificador de usuario? (s/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "�De verdad quiere revocar la clave completa? (s/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "�De verdad quiere revocar esta subclave? (s/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"La confianza del propietario no puede establecerse si se est� usando\n"
"una base de datos de confianza propocionada por el usuario\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Establecer lista de preferencias a:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "�Actualizar realmente las preferencias? (s/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "�Grabar cambios? (s/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "�Salir sin grabar? (s/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "actualizaci�n fallida: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "clave secreta \"%s\" no encontrada: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "huella dactilar no v�lida"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "fallo obteniendo huella digital\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "ID de usuario inexistente.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Nada que firmar con la clave %s\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Resumen: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Caracter�sticas: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Sevidor de claves no-modificar"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Servidor de claves preferido: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Notaciones: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "La siguiente clave fue revocada en %s por %s clave %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Esta clave puede ser revocada por %s clave %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(confidencial)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "creado: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "revocada: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "caduc�: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "caduca: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "num. tarjeta: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "confianza: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "validez: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Esta clave est� deshabilitada"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4423,17 -3594,12 +4549,17 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "revocada"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "caducada"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4441,17 -3607,14 +4567,17 @@@ msgstr "
"AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
" causar que se tome como principal por defecto otro ID de usuario.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4460,78 -3623,61 +4586,78 @@@ msgstr "
"AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
"hacer que algunas versiones de PGP rechacen esta clave.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de querer a�adirla? (s/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "�Ese ID de usuario ya existe en esta clave!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta firma correcta? (s/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta firma inv�lida? (s/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta firma desconocida? (s/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "�Borrar realmente esta autofirma? (s/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d firmas borradas.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d firmas borradas\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "No se borr� nada\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "inv�lida"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID de usuario \"%s\" compactado: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "ID de usuario \"%s\": %d firma borrada\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "ID de usuario \"%s\": %d firmas borradas\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID de usuario \"%s\": ya minimizado\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID de usuario \"%s\" ya limpiado\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4540,185 -3686,155 +4666,197 @@@ msgstr "
"AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
" hacer que algunas versiones de PGP rechacen esta clave.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduzca el ID de usuario del revocador designado: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "no puede elegir una clave como su propio revocador designado\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "esta clave ya ha sido designada como revocadora\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando fecha de caducidad de subclave.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "la subclave de firmado %s ya est� certificada en cruz\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "la subclave %s no firma y as� no necesita ser certificada en cruz\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Introduzca la URL de su servidor de claves preferido: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�Seguro que quiere reemplazarlo? (s/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�Seguro que quiere borrarlo? (s/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Introduzca la notaci�n: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "�Continuar? (s/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "No hay ID de usuario con hash %s\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "No existe una subclave con �ndice %d\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "No existe una subclave con �ndice %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \"%s\"\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "firmada con su clave %s el %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (no exportable)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta firma caduc� el %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�De verdad quiere revocarla? (s/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "No est� firmado por usted.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (no revocable)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocada por la clave %s el %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Va a revocar las siguientes firmas:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La clave %s ya ha sido revocada.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La subclave %s ya ha sido revocada.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
@@@ -4759,14 -3867,10 +4897,14 @@@ msgstr "escribiendo autofirma\n
msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobaci�n de clave\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tama�o de clave redondeado a %u bits\n"
@@@ -5064,41 -4119,36 +5202,46 @@@ msgstr "
msgid "Real name: "
msgstr "Nombre y apellidos: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Caracter inv�lido en el nombre\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un n�mero\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Direcci�n de correo electr�nico: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Direcci�n inv�lida\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Comentario: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Caracter inv�lido en el comentario\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Est� usando el juego de caracteres `%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5109,7 -4159,6 +5252,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
@@@ -5126,31 -4175,24 +5269,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "�Cambia (N)ombre, (D)irecci�n o (S)alir? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "�Cambia (N)ombre, (D)irecci�n o (V)ale/(S)alir? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Por favor corrija primero el error.\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5158,7 -4200,6 +5301,7 @@@ msgstr "
"Necesita una frase contrase�a para proteger su clave secreta.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@@ -5166,16 -4207,13 +5309,16 @@@ msgstr "
"Introduzca la frase contrase�a para proteger la copia de seguridadde la "
"clave externamente a la tarjeta."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5187,7 -4225,6 +5330,7 @@@ msgstr "
"la opci�n \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5200,12 -4237,10 +5343,12 @@@ msgstr "
"generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
"entrop�a.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creaci�n de la clave fallida: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5213,59 -4248,48 +5356,59 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "la clave ya existe\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "�Crear de todas formas?"
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "�Crear de todas formas?"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Creaci�n de claves cancelada.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "escribiendo clave p�blica en `%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "error escribiendo anillo p�blico `%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "claves p�blica y secreta creadas y firmadas.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5273,7 -4297,6 +5416,7 @@@ msgstr "
"Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
"la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5281,7 -4304,6 +5424,7 @@@ msgstr "
"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5289,245 -4311,193 +5432,245 @@@ msgstr "
"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "�Crear de verdad? (s/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "almacenado de clave en la tarjeta fallido: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "no se puede crear fichero de respaldo `%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "nunca "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Pol�tica de firmas cr�ticas: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Pol�tica de firmas: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Servidor de claves cr�tico preferido: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notaci�n de firmas cr�ticas: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notaci�n de firma: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 firma incorrecta\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d firmas incorrectas\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Anillo de claves"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "omitido \"%s\": %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Huellas dactilares de la clave primaria:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Huella clave primaria:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Huella de clave ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " N�mero de serie de la tarjeta ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "renombrando `%s' en `%s' fallo: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "memorizando anillo `%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu claves memorizadas hasta ahora (%lu firmas)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu claves memorizadas (%lu firmas)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anillo creado\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "incluir claves revocadas en resultados de la b�squeda"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "incluir subclaves al buscar por ID de clave"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "recuperar autom�ticamente claves al verificar firmas"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "usar la URL de servidor de claves preferido presente en la clave"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "usar el registro PKA presente en una clave al recuperar claves"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "deshabilitado"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduzca n�mero(s), O)tro, o F)in >"
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "renovando 1 clave de %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "renovando %d claves desde %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "clave \"%s\" no encontrada en el servidor\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "clave no encontrada en el servidor\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando clave %s de %s servidor %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando clave %s de %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "enviando clave %s a %s servidor %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "enviando clave %s a %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "solicitando clave %s de %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: imposible recuperar URI %s: %s\n"
@@@ -5561,7 -4525,6 +5704,7 @@@ msgstr "datos cifrados con la clave p�b
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
@@@ -5608,259 -4562,208 +5751,260 @@@ msgstr "descifrado correcto\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "borrada frase de paso en cach� con ID: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "descifrado fallido: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nombre fichero original='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "AVISO: se observan varios textos en claro\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "no se encontr� firma\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma INCORRECTA de \"%s\""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma caducada de \"%s\""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "Firma correcta de \"%s\""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "suprimida la verificaci�n de la firma\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "no puedo manejar estos datos ambiguos en la firma\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Firmado el %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " usando %s clave %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Clave disponible en: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[incierto]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma caducada en %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "La firma caduca el %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binaria"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "modotexto"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "desconocido"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "Algoritmo de clave p�blica desconocido"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposible comprobar la firma: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "no es una firma separada\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "firma al viejo estilo (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
#| msgid "fstat of `%s' failed in %s: %s\n"
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "fstat de `%s' fall� en %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) fall� en %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "AVISO: usando un algoritmo de clave p�blica experimental %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "AVISO: las firmas Elgamal para firmar y cifrar est�n obsoletas\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "AVISO: el algoritmo de resumen %s est� obsoleto\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "firma %s, algoritmo de resumen %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opci�n obsoleta \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor use \"%s%s\" en su lugar\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "ATENCI�N: \"%s\" es una orden obsoleta - no la use\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: opci�n obsoleta \"%s\" - no tiene efecto\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Sin comprimir"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "sin_comprimir|ninguno"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "este mensaje podr�a no ser utilizable por %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "opci�n ambigua `%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "opci�n desconocida `%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA necesita un resumen cuya longitud sea m�ltiplo de 8 bits\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type `%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Clase de firma desconocida `%s'\n"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6062,31 -4932,24 +6206,31 @@@ msgstr "�Es correcta la foto? (s/n)
msgid "unable to display photo ID!\n"
msgstr "�no puedo mostrar ID fotogr�fico!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "No se dio ninguna raz�n"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "La clave ha sido reemplazada."
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "La clave ha sido comprometida"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "La clave ya no est� en uso"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "El identificador de usuario ya no es v�lido"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "raz�n para la revocaci�n: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "comentario a la revocaci�n: "
@@@ -6100,54 -4963,43 +6244,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "No hay confianza definida para:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " alias \"%s\"\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"�Qu� seguridad tiene de que esta clave pertenece realmente al usuario\n"
"que se nombra?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = No lo s� o prefiero no decirlo\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NO tengo confianza\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = conf�o absolutamente\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = volver al men� principal\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = saltar esta clave\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " q = salir\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6156,41 -5008,33 +6300,41 @@@ msgstr "
"El m�nimo nivel de confianza para esta clave es: %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "�Su decisi�n? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "�De verdad quiere asignar absoluta confianza a esta clave? (s/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: No hay seguridad de que esta clave pertenezca realmente\n"
"al usuario que se nombra\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: Hay poca seguridad de que esta clave pertenezca realmente\n"
"al usuario que se nombra\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Esta clave probablemente pertenece al usuario que se nombra\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Esta clave nos pertenece\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6200,117 -5044,92 +6344,117 @@@ msgstr "
"identificador de usuario. Si *realmente* sabe lo que est� haciendo,\n"
"puede contestar s� a la siguiente pregunta.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "�Usar esta clave de todas formas? (s/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "ATENCI�N: �Usando una clave no fiable!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " Esto puede significar que la firma est� falsificada.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta clave est� deshabilitada.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, 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:588
++#: g10/pkclist.c:589
#, 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:600
++#: g10/pkclist.c:601
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:608
++#: g10/pkclist.c:609
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:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Nota: �Esta clave ha caducado!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma es probablemente una FALSIFICACI�N.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitida: clave p�blica deshabilitada\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitida: clave p�blica ya presente\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Destinatarios actuales:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6318,75 -5137,58 +6462,75 @@@ msgstr "
"\n"
"Introduzca ID de usuario. Acabe con una l�nea vac�a: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "ID de usuario inexistente.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Clave p�blica deshabilitada.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "omitida: clave p�blica ya establecida\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "desconocido el destinatario predefinido \"%s\"\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "no hay direcciones v�lidas\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Nota: la clave %s no usa %s\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Nota: clave %s no tiene preferencias para %s\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "error creando `%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Firma separada.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Introduzca el nombre del fichero de datos: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "leyendo stdin...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "no hay datos firmados\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "imposible abrir datos firmados `%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "imposible abrir datos firmados fd=%d: %s\n"
@@@ -6426,8 -5221,6 +6570,8 @@@ msgstr "NOTA: clave secreta %s caduc� e
msgid "Note: key has been revoked"
msgstr "NOTA: la clave ha sido revocada"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "construcci�n del paquete fallida: %s\n"
@@@ -6437,43 -5229,39 +6581,49 @@@
msgid "key %s has no user IDs\n"
msgstr "clave %s: sin identificador de usuario\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Ser� revocado por:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Este es una clave de revocaci�n confidencial)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Clave secreta disponible.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "se fuerza salida con armadura ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet fall�: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Certificado de revocaci�n creado.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6481,18 -5269,27 +6631,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "clave secreta \"%s\" no encontrada: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6511,33 -5308,26 +6675,33 @@@ msgstr "
"de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
"a otras personas!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Por favor elija una raz�n para la revocaci�n:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Cancelar"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Raz�n para la revocaci�n: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(No se di� descripci�n)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "�Es correcto? (s/N) "
@@@ -6564,37 -5350,30 +6728,37 @@@ msgstr "la clave %s usa un hash insegur
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "la clave DSA %s requiere un resumen de %u bits al menos\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "por favor vea %s para m�s informaci�n\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"AVISO: la subclave de cifrado %s tiene un certificado cruzado inv�lido\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6602,7 -5381,6 +6766,7 @@@ msgstr "
"la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
"o problemas con el reloj)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6610,30 -5388,25 +6774,30 @@@ msgstr "
"la clave %s fue creada %lu segundos en el futuro (salto en el tiempo\n"
"o problemas con el reloj)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: clave de la firma %s caducada el %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: la clave de firmado %s ha sido revocada\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"asumiendo firma incorrecta de la clave %s por un bit cr�tico desconocido\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
@@@ -6678,30 -5445,24 +6842,30 @@@ msgstr "
msgid "signing:"
msgstr "firmando:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "se usar� un cifrado %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\" omitido: duplicado\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "omitido: clave secreta ya presente\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"�esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
@@@ -6749,7 -5502,6 +6913,7 @@@ msgstr "error econtrando registro de co
msgid "read error in '%s': %s\n"
msgstr "error de lectura `%s': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
@@@ -6781,7 -5528,6 +6945,7 @@@ msgstr "
msgid "trustdb transaction too large\n"
msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -6898,71 -5621,57 +7062,71 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s' no es un identificador largo de clave v�lido\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "clave %s: aceptada como clave fiable\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "la clave %s aparece m�s de una vez en la base de datos de confianza\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "clave %s: clave fiable sin clave p�blica - omitida\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "clave %s marcada como de confianza absoluta\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "registro de confianza %lu no es del tipo requerido %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
"Puede intentar recrear la base de datos de confianza usando las �rdenes:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "Si eso no funciona, por favor consulte el manual\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "usando %s como modelo de confianza\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
#| msgid "no need for a trustdb check with `%s' trust model\n"
msgid "no need for a trustdb check with '%s' trust model\n"
@@@ -6970,7 -5679,6 +7134,7 @@@ msgstr "
"no es necesaria una comprobaci�n de la base de datos de confianza\n"
"con el modelo de confianza `%s'\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
#| msgid "no need for a trustdb update with `%s' trust model\n"
msgid "no need for a trustdb update with '%s' trust model\n"
@@@ -6978,41 -5686,33 +7142,41 @@@ msgstr "
"no es necesario comprobar la base de datos de confianza\n"
"con el modelo `%s'\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "clave p�blica %s no encontrada: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "por favor haga un --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "comprobando base de datos de confianza\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d claves procesadas (%d validaciones superadas)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "no se encuentran claves absolutamente fiables\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
"%d dudosa(s) necesarias, %d completa(s) necesarias,\n"
"modelo de confianza %s\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7020,7 -5720,6 +7184,7 @@@ msgstr "
"nivel: %d validez: %3d firmada: %3d confianza: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7263,11 -5913,9 +7427,11 @@@ msgstr "El PIN para CHV%d es demasiado
msgid "verify CHV%d failed: %s\n"
msgstr "la verificaci�n CHV%d fall�: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "error recuperando el estatus CHV de la tarjeta\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "�la tarjeta est� bloqueada permanentemente!\n"
@@@ -7404,13 -6024,11 +7568,13 @@@ msgstr "la tarjeta no permite usar el a
msgid "signatures created so far: %lu\n"
msgstr "firmas creadas hasta ahora: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"actualmente se prohibe verificar el PIN del Administrador con esta orden\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@@ -7432,7 -6047,6 +7596,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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
@@@ -7499,12 -6101,10 +7663,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "use la opci�n `--daemon' para ejectuar el programa en segundo plano\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "manejador del descriptor %d iniciado\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "manejador del descriptor %d terminado\n"
@@@ -7943,7 -6451,6 +8107,7 @@@ msgstr "l�nea %d: error obteniendo clav
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "l�nea %d: generaci�n de clave fallida: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8560,7 -6947,6 +8724,7 @@@ msgstr "Certificados incluidos
msgid " runtime cached certificates: %u\n"
msgstr "n�mero de certificados coincidentes: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -8572,8 -6957,6 +8736,8 @@@ msgstr " (certificado creado en
msgid "certificate cached\n"
msgstr "certificado correcto\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -8645,7 -7017,6 +8809,7 @@@ msgstr "fallo recibiendo la l�nea: %s\n
msgid "not removing file '%s'\n"
msgstr "creaci�n de armadura fallida: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing cache file: %s\n"
@@@ -8890,243 -7217,200 +9054,243 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "error obteniendo par�metros almacenados: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "respuesta del agente inv�lida\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "converting S-expression failed: %s\n"
msgstr "al cambiar permisos de `%s' ocurri� el fallo: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "creating S-expression failed: %s\n"
msgstr "al cambiar permisos de `%s' ocurri� el fallo: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "construcci�n del paquete fallida: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
#| msgid "error getting serial number of card: %s\n"
msgid "error getting update times of CRL: %s\n"
msgstr "error obteniendo el n�mero de serie de la tarjeta: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting CRL item: %s\n"
msgstr "error obteniendo nuevo PIN: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error inserting item into temporary cache file: %s\n"
msgstr "error escribiendo en el fichero temporal: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
#| msgid "no issuer found in certificate"
msgid "no CRL issuer found in CRL: %s\n"
msgstr "no se encuentra el emisor de este certificado"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "suprimida la verificaci�n de la firma\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
#| msgid "error reading list of trusted root certificates\n"
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "error leyendo la lista de certificados ra�z fiables\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "ksba_crl_new failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "lectura fallida: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "removed stale temporary cache file '%s'\n"
msgstr "no se puede crear el fichero temporal `%s': %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "no se puede crear el fichero temporal `%s': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating temporary cache file '%s': %s\n"
msgstr "error creando fichero temporal: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "lid ?: insert failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "lid ?: inserci�n fallida: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "error escribiendo en el fichero temporal: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error closing temporary cache file '%s': %s\n"
msgstr "error creando fichero temporal: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
#| msgid "error reading input: %s\n"
msgid "error reading CRL extensions: %s\n"
msgstr "error leyendo entrada: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "creating cache file '%s'\n"
msgstr "error creando tuber�a: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "renombrando `%s' en `%s' fallo: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr ""
"ATENCI�N: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
#| msgid "error reading the card: %s\n"
msgid "problem reading cache record: %s\n"
msgstr "error leyendo la tarjeta: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
#| msgid "problem re-searching certificate: %s\n"
msgid "problem reading cache key: %s\n"
msgstr "problema re-buscando el certificado: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
#| msgid "error reading nonce on fd %d: %s\n"
msgid "error reading cache entry from db: %s\n"
msgstr "error leyendo valor �nico en el descriptor %d: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "crl_fetch via DP failed: %s\n"
msgstr "lectura fallida: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
#| msgid "lid ?: insert failed: %s\n"
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "lid ?: inserci�n fallida: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9176,84 -7450,68 +9340,84 @@@ msgstr "error recuperando `%s' v�a %s:
msgid "error retrieving '%s': http status %u\n"
msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
#| msgid "certificate `%s' not found: %s\n"
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "certificado `%s' no encontrado: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
#| msgid "certificate `%s' not found: %s\n"
msgid "certificate search not possible due to disabled %s\n"
msgstr "certificado `%s' no encontrado: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
#| msgid " (certificate created at "
msgid "add a certificate to the cache"
msgstr " (certificado creado en "
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
#| msgid "bad certificate"
msgid "validate a certificate"
msgstr "certificado incorrecto"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
#| msgid "bad certificate"
msgid "lookup a certificate"
msgstr "certificado incorrecto"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
#| msgid "Included certificates"
msgid "lookup only locally stored certificates"
msgstr "Certificados incluidos"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "load a CRL into the dirmngr"
msgstr "pasar una orden a dirmngr"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
#| msgid "export certificates"
msgid "expect certificates in PEM format"
msgstr "exporta certificado"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Introduzca el ID de usuario del revocador designado: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9261,252 -7519,177 +9425,221 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error reading certificate from stdin: %s\n"
msgstr "error almacenando certificado: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
#| msgid "error reading from %s: %s\n"
msgid "error reading certificate from '%s': %s\n"
msgstr "error leyendo de %s: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "no se puede conectar con `%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "actualizaci�n fallida: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "loading CRL '%s' failed: %s\n"
msgstr "renombrando `%s' en `%s' fallo: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "validation of certificate failed: %s\n"
msgstr "borrado del certificado \"%s\" fallido: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "certificado correcto\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
#| msgid "certificate has been revoked"
msgid "certificate has been revoked\n"
msgstr "el certificado ha sido revocado"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "certificate check failed: %s\n"
msgstr "borrado del certificado \"%s\" fallido: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "no se puede obtener informaci�n de `%s': %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "error escribiendo anillo privado `%s': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, 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/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- #, fuzzy
- #| msgid "no running dirmngr - starting `%s'\n"
- msgid "no running dirmngr - starting one\n"
- msgstr "no hay dirmngr en ejecuci�n - iniciando `%s'\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- #| msgid "malformed DIRMNGR_INFO environment variable\n"
- msgid "malformed %s environment variable\n"
- msgstr "variable de entorno DIRMNGR_INFO malformada\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "la versi�n del protocolo dirmngr %d no puede usarse\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "no puedo conectar con el dirmngr - intentando retirada\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "no se puede conectar con `%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "algoritmo no disponible: %s"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: 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:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, 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:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "pasar una orden a dirmngr"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|FICHERO|escribir logs en modo servidor en FICHERO"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "�Salir sin grabar? (s/N) "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "permitir b�squedas PKA (peticiones DNS)"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 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:207
++#: dirmngr/dirmngr.c:209
#, 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:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
# ordenes -> �rdenes
# 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:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9519,13 -7702,11 +9652,13 @@@ msgstr "
"@\n"
"(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, 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:352
++#: dirmngr/dirmngr.c:355
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -9537,88 -7718,71 +9670,88 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, 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:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "uso: gpgsm [opciones] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, 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:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, 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:1582
++#: dirmngr/dirmngr.c:1591
#, 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:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "huella dactilar no v�lida"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, 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:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "no forzado"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9889,12 -8002,10 +10022,12 @@@ msgstr "enviando clave %s a %s servido
msgid "malloc failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9933,11 -8038,11 +10066,13 @@@ msgid "response from server too large;
msgstr ""
"Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ #| msgid "certificate `%s' not found: %s\n"
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "certificado `%s' no encontrado: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -10104,81 -8179,71 +10239,87 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "fallo mandando la l�nea: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "fallo mandando la l�nea: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, 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:2304
++#: dirmngr/server.c:2409
+ #, 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:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, 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:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10447,13 -8452,11 +10588,13 @@@ msgstr "Opciones que controlan el forma
msgid "Options controlling the interactivity and enforcement"
msgstr "Opciones que controlan la interactividad y obligaci�n"
+#: tools/gpgconf-comp.c:911
#, fuzzy
#| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr "Opciones que controlan la seguridad"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "Configuraci�n de servidores HTTP"
diff --cc po/et.gmo
index bf7f439,0000000..53045c4
mode 100644,000000..100644
Binary files differ
diff --cc po/et.po
index a1305b2,3a883d6..9508ce0
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "vigane parool
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -77,75 -65,59 +77,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "halb parool"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "rida on liiga pikk\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "liiga pikk parool\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Lubamatu s�mbol nimes\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "halb MPI"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "halb parool"
@@@ -155,25 -126,11 +155,25 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -246,11 -190,9 +246,11 @@@ msgstr "Palun sisestage parool; see on
msgid "failed to create stream from socket: %s\n"
msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -393,42 -309,28 +393,42 @@@ msgstr "
"V�tmed:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ole jutukas"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole m�nev�rra vaiksem"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -513,11 -398,6 +513,11 @@@ msgstr "ei ole toetatud
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -533,145 -411,107 +533,144 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s ei �nnestu luua: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: kataloog on loodud\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: kataloogi ei �nnestu luua: %s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: j�tsin vahele: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@@ -687,8 -525,6 +686,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -696,9 -532,6 +695,9 @@@ msgstr "
"@K�sud:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -752,7 -577,6 +751,7 @@@ msgstr "Katkesta
msgid "error while asking for the passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -935,8 -725,6 +934,8 @@@ msgstr "viga parooli loomisel: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "viga parooli loomisel: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -1089,7 -845,6 +1088,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1108,7 -860,6 +1107,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1402,7 -1093,6 +1401,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "ei t��deldud"
@@@ -1585,19 -1237,14 +1584,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "Sisestage parool: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "salajane v�ti ei ole k�ttesaadav"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
@@@ -1612,222 -1257,171 +1611,222 @@@ msgstr "See k�sklus ei ole %s moodis lu
msgid "Reset Code not or not anymore available\n"
msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Teie valik? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "P�hjus puudub"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "ei t��deldud"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "vastavat avalikku v�tit pole: %s\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "uuendatud eelistused"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "n�ita s�rmej�lge"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "ei leia OpenPGP andmeid.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "�mardatud �les %u bitini\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1835,155 -1429,120 +1834,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Allkiri aegus %s\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Vigane valik.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Palun valige t�histamise p�hjus:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "See k�sklus ei ole %s moodis lubatud.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Allkirjastan t�esti? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "v�lju sellest men��st"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "vastuolulised k�sud\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "n�ita seda abiinfot"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "V�tme leiate: "
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "muuda aegumise kuup�eva"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "muuda omaniku usaldust"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "n�ita s�rmej�lge"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "genereeri uus v�tmepaar"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "vastuolulised k�sud\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "vastuolulised k�sud\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
@@@ -1991,78 -1549,64 +1990,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "v�ti --output ei t��ta selle k�suga\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "`%s' ei �nnestu avada\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "viga v�tmebloki lugemisel: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "v�tit '%s' ei leitud: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(kui te just ei m��ra v�tit s�rmej�ljega)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "pakettmoodis ei �nnestu seda teha v�tmeta \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Kustutan selle v�tme v�tmehoidlast? "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "See on salajane v�ti! - kas kustutan t�esti? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "key"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Avalik v�ti: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "omaniku usalduse info puhastatud\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@@ -2115,7 -1651,6 +2120,7 @@@ msgid "forcing symmetric cipher %s (%d
msgstr ""
"s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
@@@ -2202,292 -1721,245 +2207,312 @@@ msgstr "HOIATUS: ei saa kustutada ajuti
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
"`%s' jaoks pole t�histamise v�tmeid\n"
"\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "mittekasutatav salajane v�ti"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: j�tsin vahele: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[Kasutaja id puudub]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "n�ita s�rmej�lge"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "salajast v�tit `%s' ei leitud: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "vigased impordi v�tmed\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
"kasutamisega\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "kr�pteeri andmed"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "dekr�pteeri andmed (vaikimisi)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "kontrolli allkirja"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "n�ita v�tmeid"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "n�ita v�tmeid ja allkirju"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "kontrolli v�tmete allkirju"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "eemalda v�tmed avalike v�tmete hoidlast"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allkirjasta v�ti"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "allkirjasta v�ti"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "muuda parooli"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "ekspordi v�tmed"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "ekspordi v�tmed v�tmeserverisse"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "impordi v�tmed v�tmeserverist"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "otsi v�tmeid v�tmeserverist"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "uuenda v�tmeid v�tmeserverist"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "impordi/mesti v�tmed"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|kr�pti NIMEle"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "�ra tee mingeid muutusi"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "k�si enne �lekirjutamist"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2495,7 -1967,6 +2520,7 @@@ msgstr "
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2515,13 -1986,11 +2540,13 @@@ msgstr "
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2536,7 -2005,6 +2561,7 @@@ msgstr "
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2544,587 -2012,513 +2569,652 @@@ msgstr "
"\n"
"Toetatud algoritmid:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Avalik v�ti: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "�iffer: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "R�si: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Pakkimine: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "kasuta: gpg [v�tmed] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tundmatu seade \"%s\"\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "blokeeri v�ti"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "tundmatu vaikimisi saaja `%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "tundmatu vaikimisi saaja `%s'\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku �ifri eelistused\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku l�hendi eelistused\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei t��ta veel koos %s-ga\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "vigane r�sialgoritm `%s'\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "vigane r�sialgoritm `%s'\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [failinimi]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key kasutaja-id"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "viga parooli loomisel: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[failinimi]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "v�ta v�tmed sellest v�tmehoidlast"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "teata ajatemplite konfliktist ainult hoiatusega"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3300,7 -2660,6 +3390,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
@@@ -3310,7 -2668,6 +3400,7 @@@
msgid "key %s: %s\n"
msgstr "`%s' j�tsin vahele: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3334,7 -2687,6 +3424,7 @@@ msgstr "v�ti %08lX: puudub kehtiv kasut
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
@@@ -3344,259 -2695,222 +3434,274 @@@
msgid "key %s: new key - skipped\n"
msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "kirjutan faili `%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, 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:1132
++#: g10/import.c:1136
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, 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:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salajast v�tit `%s' ei leitud: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "v�ti %08lX: vigane alamv�tme seos\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, 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:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
@@@ -3623,61 -2933,52 +3728,66 @@@ msgstr "v�tmehoidla `%s' on loodud\n
msgid "keyring '%s' created\n"
msgstr "v�tmehoidla `%s' on loodud\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "viga `%s' lugemisel: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[t�histamine]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[iseenda allkiri]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 halb allkiri\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d halba allkirja\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3690,63 -2991,53 +3800,68 @@@ msgstr "
"passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Usaldan v�hesel m��ral\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Usaldan t�iesti\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kasutaja ID \"%s\" on t�histatud."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Ei saa allkirjastada.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kasutaja ID \"%s\" on aegunud."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Allkirjastan t�esti? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3755,11 -3046,9 +3870,11 @@@ msgstr "
"Iseenda allkiri \"%s\"\n"
"on PGP 2.x stiilis allkiri.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3768,11 -3057,9 +3883,11 @@@ msgstr "
"Teie praegune allkiri \"%s\"\n"
"on aegunud.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3781,44 -3068,35 +3896,44 @@@ msgstr "
"Teie praegune allkiri \"%s\"\n"
"on lokaalne allkiri.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "See v�ti on aegunud!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "See v�ti aegub %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3828,32 -3106,26 +3943,32 @@@ msgstr "
"kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
"sisestage \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ma ei vasta.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ma ei ole �ldse kontrollinud.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3862,269 -3134,214 +3977,269 @@@ msgstr "
"Olete t�esti kindel, et soovite seda v�tit oma\n"
"v�tmega allkirjastada: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"See saab olema iseenda allkiri.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Allkiri m�rgitakse mitte-eksporditavaks.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Ma ei ole seda v�tit �ldse kontrollinud.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Allkirjastan t�esti? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "t�stan v�tme allkirja �igesse kohta\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "salvesta ja v�lju"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "n�ita s�rmej�lge"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Allkirja noteerimine: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "n�ita v�tit ja kasutaja IDd"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "vali kasutaja ID N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "vali kasutaja ID N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "t�hista allkirjad"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "allkirjasta v�ti lokaalselt"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "lisa kasutaja ID"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "lisa foto ID"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "kustuta kasutaja ID"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "kustuta sekundaarne v�ti"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "lisa t�histamise v�ti"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "m�rgi kasutaja ID primaarseks"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "n�ita eelistusi (ekspert)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "n�ita eelistusi (detailsena)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "muuda parooli"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "muuda omaniku usaldust"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "t�hista kasutaja ID"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "t�hista sekundaarne v�ti"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "luba v�ti"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "blokeeri v�ti"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "n�ita foto ID"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Salajane v�ti on kasutatav.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4132,267 -3349,210 +4247,267 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "V�ti on t�histatud."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "tundmatu allkirja klass"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "See k�sklus ei ole %s moodis lubatud.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Kas te t�esti soovite seda v�tit kustutada? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Kas t�histan t�esti selle kasutaja ID? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Kas te t�esti soovite seda v�tit t�histada? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Kas te t�esti soovite seda v�tit t�histada? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "sea eelistuste nimekiri"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Kas t�esti uuendan seaded? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Salvestan muutused? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "V�ljun salvestamata? "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "salajast v�tit `%s' ei leitud: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Tundmatu kasutaja ID.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Teatel�hend: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Omadused: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Noteering: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (tundlik)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s ei �nnestu luua: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[t�histatud] "
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [aegub: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [aegub: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " usaldus: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " usaldus: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "See v�ti on blokeeritud"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4400,19 -3560,14 +4515,19 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[t�histatud] "
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4420,17 -3575,14 +4535,17 @@@ msgstr "
"HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks. See k�sklus v�ib\n"
" p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4439,79 -3591,62 +4554,79 @@@ msgstr "
"HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
" PGP versioone seda v�tit tagasi l�kkama.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Kustutan selle vigase allkirja? (j/E/v)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Kustutatud %d allkiri.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Kustutatud %d allkirja.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Midagi ei kustutatud.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
#, fuzzy
msgid "invalid"
msgstr "vigane pakend"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Kasutaja ID \"%s\" on t�histatud."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Kasutaja ID \"%s\" on t�histatud."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Kasutaja ID \"%s\" on t�histatud."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4520,194 -3655,160 +4635,202 @@@ msgstr "
"HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
" p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse v�tme aegumise aega.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Allkirja noteerimine: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Kirjutan �le (j/E)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Kasutaja ID numbriga %d puudub\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "kasutaja ID: \""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " allkirjastanud %08lX %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (mitte-eksporditav)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "See allkiri aegub %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " allkirjastanud %08lX %s%s\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (mitte-eksporditav)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " t�histanud %08lX %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute t�histama j�rgmisi allkirju:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "salajast v�tit pole\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
@@@ -4749,14 -3842,10 +4872,14 @@@ msgstr "kirjutan iseenda allkirja\n
msgid "writing key binding signature\n"
msgstr "kirjutan v�tit siduva allkirja\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane v�tme suurus; kasutan %u bitti\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "v�tme suurus �mardatud �les %u bitini\n"
@@@ -5053,41 -4093,36 +5176,46 @@@ msgstr "
msgid "Real name: "
msgstr "P�risnimi: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Lubamatu s�mbol nimes\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Nimi ei v�i alata numbriga\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "E-posti aadress: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Kommentaar: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Lubamatu s�mbol kommentaaris\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Te kasutate kooditabelit `%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5098,7 -4133,6 +5226,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
@@@ -5113,35 -4147,28 +5241,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Palun parandage k�igepealt viga\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5149,23 -4176,19 +5277,23 @@@ msgstr "
"Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "parooli ei korratud �ieti; proovige uuesti"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5177,7 -4200,6 +5305,7 @@@ msgstr "
"kasutades seda programmi v�tmega \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5189,12 -4211,10 +5317,12 @@@ msgstr "
"kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
"koguda paremat entroopiat.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5202,56 -4222,45 +5330,56 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' on juba pakitud\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Kasutan seda v�tit ikka? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
msgid "creating anyway\n"
msgstr "genereeri uus v�tmepaar"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "V�tme genereerimine katkestati.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "kirjutan avaliku v�tme faili `%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5261,260 -4270,206 +5389,260 @@@ msgstr "
"Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
"kasutades v�tit \"--edit-key\".\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon t�esti? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "mitte kunagi"
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kriitiline allkirja poliitika: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Allkirja poliitika: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kriitiline allkirja noteerimine: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Allkirja noteerimine: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 halb allkiri\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d halba allkirja\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "V�tmehoidla"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "`%s' j�tsin vahele: %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Primaarse v�tme s�rmej�lg:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Alamv�tme s�rmej�lg:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Primaarse v�tme s�rmej�lg:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Alamv�tme s�rmej�lg:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " V�tme s�rmej�lg ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrollin v�tmehoidlat `%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: v�tmehoidla on loodud\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allkirjastatud teie v�tmega %08lX %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
@@@ -5548,7 -4497,6 +5676,7 @@@ msgstr "avaliku v�tmega kr�pteeritud an
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ka \""
@@@ -5594,258 -4533,206 +5722,258 @@@ msgstr "lahtikr�pteerimine �nnestus\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "algne failinimi on='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "HALB allkiri kasutajalt \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Aegunud allkiri kasutajalt \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "allkirja kontroll j�eti �ra\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neid allkirju ei �nnestu t��delda\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ka \""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "V�tme leiate: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[ebakindel]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ka \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Allkiri aegub %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binaarne"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "tekstimood"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "tundmatu"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tundmatu avaliku v�tme algoritm"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allkirja ei saa kontrollida: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "ei ole eraldiseisev allkiri\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "vana stiili (PGP 2.x) allkiri\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "faili ei �nnestu avada: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "realiseerimata �ifri algoritm"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "palun kasutage selle asemel \"%s%s\"\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Pakkimata"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "Pakkimata"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "tundmatu allkirja klass"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6040,31 -4894,24 +6168,31 @@@ msgstr "On see foto �ige (j/E/v)?
msgid "unable to display photo ID!\n"
msgstr "foto ID ei saa n�idata!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "P�hjus puudub"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "V�ti on asendatud"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "V�ti on kompromiteeritud"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "V�ti ei ole enam kasutusel"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Kasutaja ID ei ole enam kehtiv"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "t�histamise p�hjus: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "t�histamise kommentaar: "
@@@ -6078,98 -4925,79 +6206,98 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iItTvVjJ"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Usalduse v��rtus puudub:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " ka \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Ei tea\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = EI usalda\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Usaldan absoluutselt\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " t = tagasi p�himen��sse\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " j = j�ta see v�ti vahele\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " v = v�lju\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Teie otsus? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Kas te t�esti soovite seda v�tit absoluutselt usaldada? "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "See v�ti kuulub meile\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6181,114 -5009,89 +6309,114 @@@ msgstr "
"v�ite j�rgnevale k�simusele vastata jaatavalt\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Kasutan seda v�tit ikka? "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
#, 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:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "M�rkus: See v�ti on blokeeritud.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "M�rkus: See v�ti on aegunud!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Allkiri on t�en�oliselt V�LTSING.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: j�tsin vahele: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, 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:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6296,75 -5099,58 +6424,75 @@@ msgstr "
"\n"
"Sisestage kasutaja ID. L�petage t�hja reaga: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Tundmatu kasutaja ID.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Avalik v�ti on blokeeritud.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "kehtivaid aadresse pole\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Eraldiseisev allkiri.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Palun sisestage andmefaili nimi: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "loen standardsisendit ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "allkirjastatud andmeid pole\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
@@@ -6403,8 -5182,6 +6531,8 @@@ msgstr "M�RKUS: salajane v�ti %08lX aeg
msgid "Note: key has been revoked"
msgstr "M�RKUS: v�ti on t�histatud"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet eba�nnestus: %s\n"
@@@ -6414,45 -5190,41 +6542,51 @@@
msgid "key %s has no user IDs\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "T�histaja:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(See on tundlik t�histamise v�ti)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Salajane v�ti on kasutatav.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet eba�nnestus: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "T�histamise sertifikaat on loodud.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
"`%s' jaoks pole t�histamise v�tmeid\n"
"\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6460,19 -5232,27 +6594,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "salajast v�tit `%s' ei leitud: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6493,33 -5273,26 +6640,33 @@@ msgstr "
"tr�kis�steem\n"
"v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Palun valige t�histamise p�hjus:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Katkesta"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(T�en�oliselt soovite siin valida %d)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "T�histamise p�hjus: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Kirjeldust ei antud)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "On see h�sti? "
@@@ -6545,68 -5314,55 +6692,68 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "HOIATUS: allkirja l�hend on teatega konfliktne\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = esita palun t�iendavat infot\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "HOIATUS: allkirjastamise alamv�tmel %08lX on vigane rist-sertifikaat\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "avalik v�ti %08lX on %lu sekundit uuem, kui allkiri\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "M�RKUS: v�ti on t�histatud"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
@@@ -6651,33 -5401,27 +6798,33 @@@ msgstr "
msgid "signing:"
msgstr "allkirjastan:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "kasutatakse %s kr�pteerimist\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "`%s' j�tsin vahele: duplikaat\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
"mis ei ole allkirjades kasutamiseks turvaline!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
@@@ -6725,7 -5461,6 +6872,7 @@@ msgstr "viga usalduse kirje otsimisel:
msgid "read error in '%s': %s\n"
msgstr "viga lugemisel: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync eba�nnestus: %s\n"
@@@ -6754,7 -5484,6 +6901,7 @@@ msgstr "trustdb rec %lu: write failed (
msgid "trustdb transaction too large\n"
msgstr "trustdb transaktsioon on liiga suur\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "`%s' ei �nnestu sulgeda: %s\n"
@@@ -6871,118 -5577,94 +7018,118 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "`%s' ei ole kehtiv pikk v�tmeID\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "v�ti %08lX esineb trustdb failis enam kui korra\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "trustdb kontrolliks puudub vajadus\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "trustdb j�rgmine kontroll %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "trustdb kontrolliks puudub vajadus\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "trustdb kontrolliks puudub vajadus\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "ei leia avalikku v�tit %08lX: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "palun tehke --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "kontrollin trustdb faili\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
@@@ -7219,11 -5852,9 +7366,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7364,12 -5967,10 +7511,12 @@@ msgstr "%s allkiri, s�numil�hendi algor
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ei leia OpenPGP andmeid.\n"
@@@ -7390,7 -5988,6 +7537,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7450,12 -6035,10 +7597,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7887,7 -6378,6 +8034,7 @@@ msgstr "viga v�tmehoidla `%s' loomisel
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8485,7 -6855,6 +8632,7 @@@ msgstr "halb sertifikaat
msgid " runtime cached certificates: %u\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "T�histamise sertifikaat on loodud.\n"
@@@ -8495,8 -6863,6 +8642,8 @@@
msgid "certificate cached\n"
msgstr "eelistus %c%lu on duplikaat\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@@ -8558,7 -6913,6 +8705,7 @@@ msgstr "v�tmebloki kustutamine eba�nnes
msgid "not removing file '%s'\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -8782,220 -7092,177 +8929,220 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "vigane vastus agendilt\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "faili ei �nnestu avada: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet eba�nnestus: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "kirjutan faili `%s'\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "genereeri t�histamise sertifikaat"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "allkirja kontroll j�eti �ra\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "kirjutan faili `%s'\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: viga vaba kirje lugemisel: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
@@@ -9041,75 -7298,59 +9188,75 @@@ msgstr "viga `%s' loomisel: %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "viga `%s' lugemisel: %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "v�tit '%s' ei leitud: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "T�histamise sertifikaat on loodud.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "halb sertifikaat"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "halb sertifikaat"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "halb sertifikaat"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "halb sertifikaat"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9117,226 -7358,155 +9264,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "eelistus %c%lu on duplikaat\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "M�RKUS: v�ti on t�histatud"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Toetatud algoritmid:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "V�ljun salvestamata? "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9349,91 -7519,72 +9469,91 @@@ msgstr "
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "kasuta: gpg [v�tmed] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "rida on liiga pikk\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "viga lugemisel: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "ei t��deldud"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9684,12 -7784,10 +9804,12 @@@ msgstr "otsin \"%s\" HKP serverist %s\n
msgid "malloc failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9724,11 -7816,10 +9844,12 @@@ msgstr "viga `%s' lugemisel: %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "v�tit '%s' ei leitud: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9876,72 -7937,61 +9997,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10198,11 -8188,9 +10324,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/fi.gmo
index 56c4b6e,0000000..ad34335
mode 100644,000000..100644
Binary files differ
diff --cc po/fi.po
index 9b46580,c3a6688..dc5dda2
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@@ -83,7 -72,6 +83,7 @@@ msgstr "väärä salasana
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -93,75 -81,59 +93,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "väärä salasana"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "rivi on liian pitkä\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "salasana on liian pitkä\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Nimessä on epäkelpo merkki\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "MPI ei kelpaa"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "väärä salasana"
@@@ -171,25 -142,11 +171,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -262,11 -206,9 +262,11 @@@ msgstr "Ole hyvä ja syötä salasana,
msgid "failed to create stream from socket: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -409,42 -325,28 +409,42 @@@ msgstr "
"Valitsimet:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "monisanainen"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole jonkinverran hiljaisempi"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -529,11 -414,6 +529,11 @@@ msgstr "ei tuettu
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@@ -550,145 -428,107 +550,144 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: hakemisto luotu\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: hakemistoa ei voi luoda: %s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@@ -704,8 -542,6 +703,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -713,9 -549,6 +712,9 @@@ msgstr "
"@Komennot:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -769,7 -594,6 +768,7 @@@ msgstr "Peru
msgid "error while asking for the passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -952,8 -742,6 +951,8 @@@ msgstr "virhe luotaessa salasanaa: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -1106,7 -862,6 +1105,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1125,7 -877,6 +1124,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1419,7 -1110,6 +1418,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "ei käsitelty"
@@@ -1604,19 -1256,14 +1603,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "Syötä salasana: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "salaista avainta ei löydy"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
@@@ -1631,222 -1276,171 +1630,222 @@@ msgstr "Tätä komentoa ei sallita %s-t
msgid "Reset Code not or not anymore available\n"
msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Valintasi? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "Ei eriteltyä syytä"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "ei käsitelty"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "ei vastaavaa julkista avainta: %s\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "päivitä valinnat"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "Valinnassa on luvaton merkki\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "Valinnassa on luvaton merkki\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "näytä sormenjälki"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1854,155 -1448,120 +1853,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Valitse millaisen avaimen haluat:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Valinta ei kelpaa.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Valitse mitätöinnin syy:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "ulos tästä valikosta"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "näytä tämä ohje"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "Avain saatavilla kohteessa: "
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "muuta voimassoloaikaa"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "muuta luottamusastetta"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "näytä sormenjälki"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "luo uusi avainpari"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
@@@ -2010,78 -1568,64 +2009,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, 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:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "avainta \"%s\" ei löydy: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(ellet määritä avainta sormenjäljen perusteella)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "ei onnistu eräajossa ilman \"--yes\"-valitsinta\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Poista tämä avain avainrenkaasta? "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Tämä on salainen avain! - poista varmasti? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "key"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "JulkAvain: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "luottamustiedot pyyhitty\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -2131,7 -1667,6 +2136,7 @@@ msgstr "valittu pakkausalgoritmi %s (%d
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
@@@ -2219,290 -1738,243 +2224,310 @@@ msgstr "VAROITUS: tilapäistiedostoa (%
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "salaista avainta ei voi käyttää"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ohitettu: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "VAROITUS: mitään ei viety\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[Käyttäjätunnusta ei löytynyt]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "näytä sormenjälki"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "salaista avainta \"%s\" ei löydy: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "virheelliset tuontivalitsimet\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr ""
"käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "salaa tiedot"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "näytä avaimet"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "näytä avaimet allekirjoituksineen"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "luo mitätöintivarmenne"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "poista avaimet salaisten avainten renkaasta"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "allekirjoita tai muokkaa avainta"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "muuta salasanaa"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "vie avaimia"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "vie avaimia palvelimelle"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "nouda avaimia avainpalvelimelta"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "etsi avaimia avainpalvelimelta"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "päivitä kaikki avaimet avainpalvelimelta"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "nouda/liitä avaimia"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "päivitä luottamustietokanta"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, 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:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "älä tee muutoksia"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "kysy ennen ylikirjoittamista"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2511,7 -1983,6 +2536,7 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2530,13 -2001,11 +2555,13 @@@ msgstr "
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2551,7 -2020,6 +2576,7 @@@ msgstr "
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2559,588 -2027,514 +2584,653 @@@ msgstr "
"\n"
"Tuetut algoritmit:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "JulkAvain: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Salaus: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Tiiviste: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Pakkaus: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "käyttö: gpg [valitsimet] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "poista avain käytöstä"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth tulee olla välillä 1-255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [tiedostonimi]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [tiedostonimi]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [tiedostonimi]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--allekirjoita [tiedostonimi]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [tiedostonimi]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [tiedostonimi]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [tiedostonimi]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key käyttäjätunnus"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key käyttäjätunnus"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key käyttäjätunnus [komennot]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key käyttäjätunnus"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "virhe luotaessa salasanaa: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[tiedostonimi]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "ota avaimet tästä avainrenkaasta"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3317,7 -2677,6 +3407,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@@ -3327,7 -2685,6 +3417,7 @@@
msgid "key %s: %s\n"
msgstr "ohitetaan \"%s\": %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3351,7 -2704,6 +3441,7 @@@ msgstr "avain %08lX: ei voimassaolevia
msgid "this may be caused by a missing self-signature\n"
msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
@@@ -3361,261 -2712,224 +3451,276 @@@
msgid "key %s: new key - skipped\n"
msgstr "avain %08lX: uusi avain - ohitetaan\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, 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:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "avain %08lX: \"%s\" ei muutoksia\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "avain %08lX: salainen avain tuotu\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "avain %08lX: käyttäjätunnus ohitettu '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "avain %08lX: aliavain ohitettu\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
@@@ -3642,62 -2952,53 +3747,67 @@@ msgstr "avainrengas \"%s\" luotu\n
msgid "keyring '%s' created\n"
msgstr "avainrengas \"%s\" luotu\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[mitätöinti]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[oma-allekirjoitus]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 väärä allekirjoitus\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d väärää allekirjoitusta\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr ""
"havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3710,63 -3011,53 +3820,68 @@@ msgstr "
"lähteistä...)?\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Luotan osittain\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Luotan täysin\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Allekirjoittaminen ei onnistu.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3775,13 -3066,11 +3890,13 @@@ msgstr "
"Oma-allekirjoitus kohteessa \"%s\"\n"
"on PGP 2.x -muodon allekirjoitus.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
"Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
"(k/E) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3790,11 -3079,9 +3905,11 @@@ msgstr "
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on vanhentunut.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3803,44 -3090,35 +3918,44 @@@ msgstr "
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on paikallinen allekirjoitus.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Tämä avain on vanhentunut!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Avain vanhenee %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3849,32 -3127,26 +3964,32 @@@ msgstr "
"Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
"Jos et tiedä vastausta, syötä \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) En vastaa.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) En ole tarkistanut lainkaan.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Olen suorittanut arkisen tarkistuksen.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3883,269 -3155,214 +3998,269 @@@ msgstr "
"Haluatko varmasti allekirjoittaa tämän avaimen\n"
"omalla avaimellasi: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Tämä tulee olemaan oma-allekirjoitus.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"En ole tarkistanut tätä avainta lainkaan.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Olen tarkistanut avaimen arkisesti.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Olen tarkistanut avaimen erittäin huolellisesti.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "tallenna ja lopeta"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "näytä sormenjälki"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Allekirjoitusnotaatio: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "näytä avaimet ja käyttäjätunnukset"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "valitse käyttäjätunnus N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "valitse käyttäjätunnus N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "mitätöi allekirjoitus"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "lisää käyttäjätunnus"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "lisää valokuva"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "poista käyttäjätunnus"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "poista toissijainen avain"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "lisää mitätöintiavain"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "merkitse käyttäjätunnus ensisijaiseksi"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "näytä valinnat (asiantuntija)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "näytä valinnat (monisanaisesti)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "muuta salasanaa"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "muuta luottamusastetta"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "mitätöi käyttäjätunnus"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "mitätöi toissijainen avain"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "ota avain käyttöön"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "poista avain käytöstä"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "näytä valokuvatunniste"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Salainen avain on saatavilla.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Tähän tarvitaan salainen avain.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4153,267 -3370,210 +4268,267 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Avain on mitätöity."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "tuntematon allekirjoitusluokka"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Varmastiko poista tämä käyttäjätunnus? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Varmastiko poista tämä käyttäjätunnus? "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Sinun täytyy valita ainakin yksi avain.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Sinun täytyy valita ainakin yksi avain.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Haluatko varmasti poistaa tämän avaimen? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "näytä valinnat"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Varmastiko päivitä valinnat? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Tallenna muutokset? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Lopeta tallentamatta muutoksia?"
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "salaista avainta \"%s\" ei löydy: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Käyttäjätunnusta ei löydy.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Tiiviste: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Ominaisuudet: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Notaatio: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (luottamuksellinen)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[mitätöity] "
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [vanhenee: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [vanhenee: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " luottamus: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " luottamus: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Tämä avain on poistettu käytöstä"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4421,19 -3581,14 +4536,19 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[mitätöity] "
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4441,17 -3596,14 +4556,17 @@@ msgstr "
"VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi. Tämän \n"
"komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4460,79 -3612,62 +4575,79 @@@ msgstr "
"VAROITUS: Tämä on PGP2-muodon avain. Valokuvan lisääminen voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d allekirjoitus poistettu.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d allekirjoitusta poistettu.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Mitään ei poistettu.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
#, fuzzy
msgid "invalid"
msgstr "virheellinen ascii-koodaus"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4542,196 -3677,162 +4657,204 @@@ msgstr "
"voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Valitse tasan yksi käyttäjätunnus!\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ylikirjoita (k/E)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "käyttäjätunnus: \""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " %08lX allekirjoitti tämän %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (vientiin kelpaamaton)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Tämä allekirjoitus vanheni %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " %08lX allekirjoitti tämän %s%s\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (vientiin kelpaamaton)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " %08lX mitätöi tämän %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "salainen avain ei ole saatavilla\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
"tulevaisuuteen\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4775,14 -3868,10 +4898,14 @@@ msgstr "kirjoitetaan oma-allekirjoitus\
msgid "writing key binding signature\n"
msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@@ -5081,41 -4121,36 +5204,46 @@@ msgstr "
msgid "Real name: "
msgstr "Oikea nimi: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Nimessä on epäkelpo merkki\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Nimi ei voi alkaa numerolla\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Sähköpostiosoite: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Huomautus: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Huomautuksessa on epäkelpo merkki\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Käytät merkistöä \"%s\".\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5126,7 -4161,6 +5254,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
@@@ -5141,35 -4175,28 +5269,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnHhSsOoLl"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Ole hyvä ja korjaa ensin virhe\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5177,23 -4204,19 +5305,23 @@@ msgstr "
"Tarvitset salasanan suojaamaan salaista avaintasi.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5205,7 -4228,6 +5333,7 @@@ msgstr "
"tämän ohjelman valitsimella \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5217,12 -4239,10 +5345,12 @@@ msgstr "
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5230,56 -4250,45 +5358,56 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" on jo pakattu\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
msgid "creating anyway\n"
msgstr "luo uusi avainpari"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Avaimen luonti keskeytetty.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5288,7 -4297,6 +5416,7 @@@ msgstr "
"Huomaa, että tätä avainta ei voida käyttää salaamiseen. Käytä komentoa\n"
"\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5296,7 -4304,6 +5424,7 @@@ msgstr "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5304,248 -4311,196 +5432,248 @@@ msgstr "
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Haluatko varmasti luoda? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "ei koskaan"
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kriittinen allekirjoituskäytäntö: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Allekirjoituskäytäntö: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kriittinen allekirjoitusnotaatio: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 väärä allekirjoitus\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d väärää allekirjoitusta\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Avainrengas"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ohitetaan \"%s\": %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Ensisijaisen avaimen sormenjälki:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Ensisijaisen avaimen sormenjälki:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " Avaimen sormenjälki ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "tarkistetaan avainrengasta \"%s\"\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: avainrengas luotu\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allekirjoitettu avaimellasi %08lX %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@@ -5579,7 -4528,6 +5707,7 @@@ msgstr "julkisella avaimella salattu da
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " aka \""
@@@ -5627,264 -4566,212 +5755,264 @@@ msgstr "avaus onnistui\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROITUS: salattua viestiä on muokattu!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Vanhentunut allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "allekirjoituksen varmistus vaiennetaan\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "näitä allekirjoituksia ei voi käsitellä\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " aka \""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Avain saatavilla kohteessa: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[ei tiedossa]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " aka \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, 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:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binääri"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "teksti"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "tuntematon "
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tuntematon julkisen avaimen algoritmi"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "allekirjoitus ei ole erillinen\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "ei voi avata tiedostoa: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "salausalgoritmi ei ole käytössä"
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "pakkaamaton"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "pakkaamaton"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "tuntematon allekirjoitusluokka"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6079,31 -4933,24 +6207,31 @@@ msgstr "Onko tämä oikein (k/E/l)?
msgid "unable to display photo ID!\n"
msgstr "valokuvatunnistetta ei voi näyttää!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Ei eriteltyä syytä"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Avain on uusittu"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Avain on murrettu"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Avain ei ole enää käytössä"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Käyttäjätunnus ei ole enää käytössä"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "mitätöinnin syy: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "mitätöintikommentti: "
@@@ -6117,102 -4964,83 +6245,102 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMlLoO"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Luottamusarvoa ei ole asetettu seuraavalle:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " aka \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = En tiedä\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = EN luota\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Luotan ehdottomasti\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = takaisin päävalikkoon\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " o = ohita tämä avain\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " l = lopeta\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Valintasi? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Haluatko varmasti luottaa tähän avaimeen ehdottomasti? "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Varmennepolku ehdottomasti luotettuun julkiseen avaimeen:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
"haltijalleen.\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
"haltijalleen.\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Tämä on oma avain\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6224,119 -5052,94 +6352,119 @@@ msgstr "
"kysymykseen kyllä\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
#, 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:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Huom: Tämä avain on poistettu käytöstä\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Huom: Tämä avain on vanhentunut!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ohitettu: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6344,76 -5147,59 +6472,76 @@@ msgstr "
"\n"
"Syötä käyttäjätunnus. Lopeta tyhjällä rivillä: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Käyttäjätunnusta ei löydy.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "ohitettu: julkinen avain on jo asetettu\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "ei kelvollisia vastaanottajia\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Erillinen allekirjoitus.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Anna datatiedoston nimi: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "luetaan vakiosyötettä ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "ei allekirjoitettua dataa\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
@@@ -6452,8 -5231,6 +6580,8 @@@ msgstr "HUOM: salainen avain %08lX vanh
msgid "Note: key has been revoked"
msgstr "HUOM: avain on mitätöity!"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet epäonnistui: %s\n"
@@@ -6463,43 -5239,39 +6591,49 @@@
msgid "key %s has no user IDs\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Mitätöinnin tekee:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Salainen avain on saatavilla.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Luo tälle avaimelle mitätöintivarmenne? "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "ASCII-koodattu tuloste määritetty.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet epäonnistui: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Mitätöintivarmenne luotu.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Luo tälle avaimelle mitätöintivarmenne? "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6507,19 -5279,27 +6641,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "salaista avainta \"%s\" ei löydy: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Luo tälle avaimelle mitätöintivarmenne? "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6539,33 -5319,26 +6686,33 @@@ msgstr "
"tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
"saataville!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Valitse mitätöinnin syy:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Peru"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Todennäköisesti haluat valita %d tässä)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Mitätöinnin syy: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Kuvausta ei annettu)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Kelpaako tämä? "
@@@ -6591,37 -5360,30 +6738,37 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = näytä lisätietoja\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6629,7 -5391,6 +6776,7 @@@ msgstr "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6637,29 -5398,24 +6784,29 @@@ msgstr "
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "HUOM: avain on mitätöity!"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
"\"critical bit\":istä\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
@@@ -6704,34 -5454,28 +6851,34 @@@ msgstr "
msgid "signing:"
msgstr "allekirjoitetaan:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "käytetään %s-salausta\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
"satunnaislukugeneraattorin kanssa!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ohitetaan \"%s\": kopio\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
"allekirjoittaa turvallisesti!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@@ -6779,7 -5515,6 +6926,7 @@@ msgstr "virhe etsittäessä luottamusti
msgid "read error in '%s': %s\n"
msgstr "lukuvirhe: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronointi epäonnistui: %s\n"
@@@ -6808,7 -5538,6 +6955,7 @@@ msgstr "trustdb rec %lu: kirjoittamine
msgid "trustdb transaction too large\n"
msgstr "trustdb-tapahtuma on liian suuri\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
@@@ -6925,119 -5631,95 +7072,119 @@@ msgstr "yli %d merkkiä pitkiä tekstir
msgid "input line longer than %d characters\n"
msgstr "syöterivi on yli %d merkkiä pitkä\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "\"%s\" ei kelpaa pitkänä avaintunnuksena\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "avain %08lX esiintyy trustdb:ssä useammin kuin kerran\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"avain %08lX: luotetulle avaimelle ei löydy julkista avainta - ohitetaan\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "trustdb:n tarkistusta ei tarvita\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "seuraava trustdb tarkistus %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "trustdb:n tarkistusta ei tarvita\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "trustdb:n tarkistusta ei tarvita\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "julkista avainta %08lX ei löydy: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "tee --check-trustdb, kiitos\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "tarkistetaan trustdb:tä\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@@ -7274,11 -5907,9 +7421,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7420,12 -6023,10 +7567,12 @@@ msgstr "%sallekirjoitus, tiivistealgori
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@@ -7446,7 -6044,6 +7593,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7506,12 -6091,10 +7653,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7943,7 -6434,6 +8090,7 @@@ msgstr "virhe luotaessa avainrengasta \
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8541,7 -6911,6 +8688,7 @@@ msgstr "virheellinen varmenne
msgid " runtime cached certificates: %u\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "Mitätöintivarmenne luotu.\n"
@@@ -8551,8 -6919,6 +8698,8 @@@
msgid "certificate cached\n"
msgstr "valinta %c%lu on kopio\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -8614,7 -6969,6 +8761,7 @@@ msgstr "avainlohkojen poisto epäonnist
msgid "not removing file '%s'\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -8839,221 -7149,178 +8986,221 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "agentin lähettämä vastaus ei kelpaa\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "ei voi avata tiedostoa: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet epäonnistui: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "luo mitätöintivarmenne"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "allekirjoituksen varmistus vaiennetaan\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr ""
"VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@@ -9099,75 -7356,59 +9246,75 @@@ msgstr "virhe luotaessa \"%s\": %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "Mitätöintivarmenne luotu.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "virheellinen varmenne"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "virheellinen varmenne"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "virheellinen varmenne"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "virheellinen varmenne"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9175,226 -7416,155 +9322,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "valinta %c%lu on kopio\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "HUOM: avain on mitätöity!"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Tuetut algoritmit:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "Lopeta tallentamatta muutoksia?"
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9408,91 -7578,72 +9528,91 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "käyttö: gpg [valitsimet] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "rivi on liian pitkä\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "lukuvirhe: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "ei käsitelty"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9743,12 -7843,10 +9863,12 @@@ msgstr "etsitään \"%s\" HKP-palvelime
msgid "malloc failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9783,11 -7875,10 +9903,12 @@@ msgstr "virhe luettaessa tiedostoa \"%s
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "avainta \"%s\" ei löydy: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9935,72 -7996,61 +10056,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10257,11 -8247,9 +10383,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/fr.gmo
index 9f98859,0000000..3cbdc41
mode 100644,000000..100644
Binary files differ
diff --cc po/fr.po
index 27d66e9,079a06d..fd3bdf8
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2015-09-10 16:22+0200\n"
"Last-Translator: David Prévot <david at tilapin.org>\n"
"Language-Team: French <traduc at traduc.org>\n"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "phrase de passe incorrecte
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Qualité :"
@@@ -88,13 -76,11 +88,13 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"La qualité du texte entré ci-dessus.\n"
"Veuillez demander à votre administrateur des précisions sur les critères."
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -102,7 -88,6 +102,7 @@@ msgstr "
"Veuillez entrer votre code personnel, afin de débloquer la clef secrète "
"pendant cette session"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -110,53 -95,40 +110,53 @@@ msgstr "
"Veuillez entrer votre phrase secrète, afin de débloquer la clef secrète "
"pendant cette session"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Phrase secrète :"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "ne correspond pas — veuillez réessayer"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (essai %d sur %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr "Répéter :"
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "Code personnel trop long"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Phrase secrète trop longue"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "Caractères incorrects dans le code personnel"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "Code personnel trop court"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "Mauvais code personnel"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Mauvaise phrase secrète"
@@@ -165,24 -136,10 +165,24 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, c-format
msgid "can't create '%s': %s\n"
msgstr "impossible de créer « %s » : %s\n"
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "impossible d'ouvrir « %s » : %s\n"
@@@ -257,11 -201,9 +257,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "échec de création du flux à partir de cette socket : %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "Veuillez insérer la carte de numéro de série"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "Veuillez retirer la carte présente et insérer celle de numéro de série"
@@@ -403,41 -319,27 +403,41 @@@ msgstr "
"@Options :\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "exécuter en mode démon (arrière-plan)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "exécuter en mode serveur (premier plan)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "bavard"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sortie de commandes à la sh"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "sortie de commandes à la csh"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FICHIER|lire les options depuis le FICHIER"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "ne pas détacher de la console"
@@@ -517,11 -402,6 +517,11 @@@ msgstr "activer la prise en charge de p
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -539,140 -417,102 +539,139 @@@ msgstr "
"Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
"Gestionnaire de clefs secrètes pour @GNUPG@\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "niveau de débogage « %s » incorrect\n"
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, c-format
msgid "option file '%s': %s\n"
msgstr "fichier d'options « %s » : %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "lecture des options de « %s »\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "impossible de créer la socket : %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, 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:1750
++#: agent/gpg-agent.c:1735
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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "erreur de lecture du « nonce » de la socket\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erreur de lien de la socket à « %s » : %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "échec de listen() : %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "écoute sur la socket « %s »\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "répertoire « %s » créé\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "échec de stat() pour « %s » : %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erreur de lecture du « nonce » sur le descripteur %d : %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "gestionnaire 0x%lx pour le descripteur %d démarré\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "gestionnaire 0x%lx pour le descripteur %d terminé\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, 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:2288
++#: agent/gpg-agent.c:2273
#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "échec de npth_pselect : %s — attente 1 s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s arrêté\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
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"
@@@ -690,8 -528,6 +689,8 @@@ msgstr "
"Syntaxe : gpg-preset-passphrase [options] KEYGRIP\n"
"Maintenance du cache des mots de passe\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -699,9 -535,6 +698,9 @@@ msgstr "
"@Commandes :\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -757,7 -582,6 +756,7 @@@ msgstr "annulé\n
msgid "error while asking for the passphrase: %s\n"
msgstr "erreur de demande de la phrase secrète : %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, c-format
msgid "error opening '%s': %s\n"
msgstr "erreur d'ouverture de « %s » : %s\n"
@@@ -949,8 -739,6 +948,8 @@@ msgstr "erreur de création d'un tube
msgid "error creating a stream for a pipe: %s\n"
msgstr "erreur de création d'un flux pour un tube : %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "erreur de création de processus fils : %s\n"
@@@ -1099,7 -855,6 +1098,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr "connexion à l'agent établie\n"
@@@ -1119,7 -871,6 +1118,7 @@@ msgstr "pas d'instance de Dirmngr en co
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "attente pour permettre au dirmngr d'arriver… (%d s)\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr "connexion au dirmngr établie\n"
@@@ -1377,7 -1068,6 +1376,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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "hors limite\n"
@@@ -1556,19 -1208,14 +1555,19 @@@ msgstr "échec de transfert de la deman
msgid "Enter passphrase: "
msgstr "Entrez la phrase secrète : "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "la carte OpenPGP n'est pas disponible : %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "carte OpenPGP nº %s détectée\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "impossible de faire cela en mode automatique\n"
@@@ -1580,157 -1225,118 +1579,157 @@@ msgstr "Cette commande n'est disponibl
msgid "Reset Code not or not anymore available\n"
msgstr "le code de réinitialisation n'est plus disponible\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Quel est votre choix ? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[non positionné]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "masculin"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "féminin"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "non indiqué"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "non forcé"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "forcé"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Erreur : seul l'ASCII standard est permis pour l'instant.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Erreur : le caractère « < » ne peut pas être utilisé.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Erreur : les espaces doubles ne sont pas permises.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Nom du détenteur de la carte : "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Prénom du détenteur de la carte : "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Erreur : nom combiné trop long (limité à %d caractères).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "URL pour récupérer la clef publique : "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Erreur : URL trop longue (limitée à %d caractères).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "erreur d'allocation de suffisamment de mémoire : %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, c-format
msgid "error reading '%s': %s\n"
msgstr "erreur de lecture de « %s » : %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "erreur d'écriture de « %s » : %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Données d'identification (nom du compte) : "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
"Erreur : données d'identification trop longues (limitées à\n"
"%d caractères).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Données DO privées : "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Erreur : DO privé trop long (limité à %d caractères).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Préférences de langue : "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Erreur : taille incorrecte de la chaîne de préférences.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Erreur : caractères incorrects dans la chaîne de préférences.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Sexe ((M)asculin, (F)éminin ou espace) : "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Erreur : réponse incorrecte.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "empreinte de l'autorité de certification : "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Erreur : formatage incorrect de l'empreinte.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "opération sur la clef impossible : %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "ce n'est pas une carte OpenPGP"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr ""
"erreur de lecture des renseignements actuellement contenus\n"
"dans la clef : %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Faut-il remplacer la clef existante ? (o/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1740,58 -1346,46 +1739,58 @@@ msgstr "
" En cas d'échec de génération de la clef, veuillez vérifier les\n"
" tailles permises dans la documentation de la carte.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Quelle taille de clef désirez-vous pour la clef de signature ? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Quelle taille de clef désirez-vous pour la clef de chiffrement ? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr ""
"Quelle taille de clef désirez-vous pour la clef d'authentification ? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrondie à %u bits\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "les tailles de clefs %s doivent être dans l'intervalle %u-%u\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "erreur de modification de taille de clef %d en %u bits : %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"Faut-il faire une sauvegarde hors carte de la clef de chiffrement ? (O/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
msgid "Note: keys are already stored on the card!\n"
msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1802,146 -1396,111 +1801,146 @@@ msgstr "
" code personnel = « %s » code personnel d'admin. = « %s ».\n"
"Vous devriez les modifier avec la commande --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Veuillez sélectionner le type de clef à générer :\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Clef de signature\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Clef de chiffrement\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Clef d'authentification\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Choix incorrect.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Veuillez sélectionner l'endroit où stocker la clef :\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "échec de KEYTOCARD : %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Cette commande n'est pas permise en mode %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
#| msgid "Note: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Continue? (Y/n) "
msgid "Continue? (y/N) "
msgstr "Faut-il continuer ? (O/n) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "quitter ce menu"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "afficher les commandes d'administration"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "afficher cette aide"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "afficher toutes les données disponibles"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "modifier le nom du détenteur de la carte"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "modifier l'URL pour récupérer la clef"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "récupérer la clef indiquée dans l'URL de la carte"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "modifier l'identifiant de connexion"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "modifier les préférences de langue"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "modifier le sexe du détenteur de la carte"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "modifier une empreinte d'autorité de certification"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
"inverser le paramètre obligeant à entrer le code personnel pour les\n"
"signatures"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "générer de nouvelles clefs"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "menu pour modifier ou déverrouiller le code personnel"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "vérifier le code personnel et afficher toutes les données"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "débloquer le code personnel en utilisant un code de réinitialisation"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/carte> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "La commande n'est utilisable qu'en mode administration\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Les commandes d'administration sont permises\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Les commandes d'administration ne sont pas permises\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Commande incorrecte (essayez « help »)\n"
@@@ -1949,73 -1507,60 +1948,80 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output n'est pas compatible avec cette commande\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, c-format
msgid "can't open '%s'\n"
msgstr "impossible d'ouvrir « %s »\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clef « %s » introuvable : %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erreur de lecture du bloc de clef : %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "clef « %s » introuvable : %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(à moins d'indiquer la clef par son empreinte)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "impossible de faire cela en mode automatique sans « --yes »\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Faut-il supprimer cette clef du porte-clefs ? (o/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "C'est une clef secrète — faut-il vraiment la supprimer ? (o/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "échec de suppression de %s secrète : %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "clef"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "subkey"
msgstr "sous-clef"
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "échec de suppression du bloc de clef : %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "les renseignements de confiance du propriétaire ont été effacées\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "il y a une clef secrète pour la clef publique « %s ».\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr ""
"utiliser d'abord l'option « --delete-secret-keys » pour la supprimer.\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erreur de création de la phrase secrète : %s\n"
@@@ -2068,7 -1605,6 +2074,7 @@@ msgstr "
"forcer le chiffrement symétrique %s (%d) est en désaccord\n"
"avec les préférences du destinataire\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "impossible d'utiliser %s en mode %s.\n"
@@@ -2158,268 -1678,222 +2164,289 @@@ msgstr "
"Attention : impossible de supprimer le répertoire temporaire « %s » :\n"
" %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "exporter les signatures marquées comme locales seulement"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exporter les attributs d'identité (en général les photos d'identité)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "exporter les clefs de révocation marquées comme « sensibles »"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "supprimer les parties inutilisables de la clef pendant l'exportation"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "supprimer autant que possible de la clef pendant l'exportation"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "il est interdit d'exporter les clefs secrètes\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "clef %s : clef de type PGP 2.x — ignorée\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "clef %s : matériel de clef sur la carte — ignorée\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
msgid " - skipped"
msgstr " — ignoré"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "Attention : rien n'a été exporté\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[identité introuvable]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "« %s » automatiquement récupéré par %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erreur de récupération de « %s » avec %s : %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "Aucune empreinte"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "clef secrète « %s » introuvable : %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "argument manquant pour l'option « %.50s »\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"La clef incorrecte %s a été rendue valable par\n"
"--allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr ""
"utilisation de la sous-clef %s à la place de la clef\n"
"principale %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "faire une signature"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "faire une signature en texte clair"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "faire une signature détachée"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "chiffrer les données"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "chiffrement symétrique seulement"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "déchiffrer les données (défaut)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "vérifier une signature"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "afficher les clefs"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "afficher les clefs et les signatures"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "afficher et vérifier les signatures de clefs"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "afficher les clefs et les empreintes"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "afficher les clefs secrètes"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "générer une nouvelle paire de clefs"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
msgid "quickly generate a new key pair"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, 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:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr "générer une paire de clefs complètes"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "générer un certificat de révocation"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "supprimer les clefs du porte-clefs public"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "supprimer les clefs du porte-clefs secret"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
msgid "quickly sign a key"
msgstr "signer rapidement une clef"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
msgid "quickly sign a key locally"
msgstr "signer rapidement une clef localement"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "signer une clef"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "signer une clef localement"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "signer ou éditer une clef"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "modifier une phrase secrète"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "exporter les clefs"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "exporter les clefs vers un serveur de clefs"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importer les clefs d'un serveur de clefs"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "chercher les clefs avec un serveur de clefs"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "mettre à jour les clefs depuis un serveur"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importer ou fusionner les clefs"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "afficher l'état de la carte"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "modifier les données d'une carte"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "modifier le code personnel d'une carte"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "mettre la base de confiance à jour"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "indiquer les fonctions de hachage"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "exécuter en mode serveur"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
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:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|niveau de compression N (0 désactive)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|FICHIER|écrire la sortie dans le FICHIER"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "ne rien modifier"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "demander avant d'écraser un fichier"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "utiliser le comportement strict d'OpenPGP"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2428,7 -1902,6 +2455,7 @@@ msgstr "
"(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2448,11 -1921,9 +2475,11 @@@ msgstr "
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2462,7 -1933,6 +2489,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:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2470,86 -1940,71 +2497,86 @@@ msgstr "
"\n"
"Algorithmes pris en charge :\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Clef publique : "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Chiffrement : "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hachage : "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Compression : "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "utilisation : %s [options] %s\n"
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2557,21 -2012,18 +2584,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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2579,483 -2031,434 +2606,555 @@@ msgstr "
"Attention : les droits du répertoire contenant le fichier de configuration\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "élément de configuration « %s » inconnu\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "montrer les photos d'identité en affichant les clefs"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
msgid "show key usage information during key listings"
msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "montrer les URL de politique en affichant les signatures"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "montrer toutes les notations en affichant les signatures"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "utiliser les notations aux normes IETF en affichant les signatures"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
"utiliser les notations fournies par l'utilisateur en affichant les signatures"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"montrer les URL des serveurs de clefs favoris en affichant les signatures"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "indiquer la validité de l'identité en affichant les clefs"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
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:1865
++#: g10/gpg.c:1881
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:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "montrer le nom du porte-clefs en affichant les clefs"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "montrer les dates d'expiration en affichant les signatures"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "Clefs disponibles :\n"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option '%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "option « %s » inconnue\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command '%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "commande « %s » inconnue\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "l'option « %.50s » est ambiguë\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring '%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "erreur de création du porte-clefs « %s » : %s\n"
+
++#: g10/gpg.c:2423
#, 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:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Remarque : %s n'est pas pour une utilisation normale.\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "mode pinentry « %s » incorrect\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "impossible d'analyser l'URL du serveur de clefs\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s : %d : options d'importation incorrectes\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "options d'importation incorrectes\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s : %d : options d'exportation incorrectes\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "options d'exportation incorrectes\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s : %d : options de liste incorrectes\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "montrer les photos d'identité en vérifiant les signatures"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "montrer les URL de politique en vérifiant les signatures"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "montrer toutes les notations en vérifiant les signatures"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
"utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
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:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "indiquer la validité de l'identité en vérifiant les signatures"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
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:2931
++#: g10/gpg.c:3290
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:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "valider les signatures avec les données PKA"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
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:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s : %d : options de vérification incorrectes\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "options de vérification incorrectes\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, 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:3134
++#: g10/gpg.c:3502
#, 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:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "liste de recherche automatique de clef incorrecte\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Attention : %s remplace %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s.\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s.\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "Attention : exécution avec un système de temps contrefait : "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "ne sera pas exécuté avec une mémoire non sécurisée à cause de %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage sélectionnée est incorrecte\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de compression sélectionné est incorrect\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "« completes-needed » doit être supérieur à 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "« marginals-needed » doit être supérieur à 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "« max-cert-depth » doit être compris entre 1 et 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "« default-cert-level » incorrect ; doit être 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "« min-cert-level » incorrect ; doit être , 1, 2 ou 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Remarque : le mode S2K simple (0) est fortement déconseillé\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K incorrect ; doit être 0, 1 ou 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "préférences par défaut incorrectes\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "préférences personnelles de chiffrement incorrectes\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "préférences personnelles de hachage incorrectes\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "préférences personnelles de compression incorrectes\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne fonctionne pas encore avec %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance : %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, 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/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [fichier]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [fichier]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "échec du chiffrement symétrique de « %s » : %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [fichier]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [fichier]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
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:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [fichier]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [fichier]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [fichier]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
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:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [fichier]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [fichier]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [fichier]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key identité"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key identité"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key identité [commandes]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd <identité>"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "échec d'envoi vers le serveur de clefs : %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "échec de réception depuis le serveur de clefs : %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "échec d'exportation de la clef : %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "échec de recherche au sein du serveur de clefs : %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "échec de déconstruction d'une armure : %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "échec de construction d'une armure : %s \n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "algorithme de hachage « %s » incorrect\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[fichier]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message…\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donnée est incorrecte\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donnée est incorrecte\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL du serveur de clefs favori qui a été donnée est incorrecte\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|FICHIER|prendre les clefs dans le porte-clefs FICHIER"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "convertir les conflits de date en avertissements"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|écrire l'état sur ce descripteur"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Utilisation : gpgv [options] [fichiers] (-h pour l'aide)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3232,7 -2601,6 +3331,7 @@@ msgstr "
"vous pouvez mettre à jour vos préférences avec :\n"
"gpg --edit-key %s updpref save\n"
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "clef %s : pas d'identité\n"
@@@ -3242,7 -2609,6 +3341,7 @@@
msgid "key %s: %s\n"
msgstr "clef %s : %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr "rejetée par le filtre d’importation"
@@@ -3265,7 -2627,6 +3364,7 @@@ msgstr "clef %s : pas d'identité vala
msgid "this may be caused by a missing self-signature\n"
msgstr "cela pourrait provenir d'une autosignature manquante\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clef %s : clef publique introuvable : %s\n"
@@@ -3275,258 -2635,221 +3374,273 @@@
msgid "key %s: new key - skipped\n"
msgstr "clef %s : nouvelle clef — ignorée\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, 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:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "écriture de « %s »\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clef %s : clef publique « %s » importée\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clef %s : ne correspond pas à notre copie\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clef %s : « %s » 1 nouvelle identité\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clef %s : « %s » %d nouvelles identités\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clef %s : « %s » 1 nouvelle signature\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clef %s : « %s » %d nouvelles signatures\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clef %s : « %s » 1 nouvelle sous-clef\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clef %s : « %s » %d nouvelles sous-clefs\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clef %s : « %s » %d signature nettoyée\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clef %s : « %s » %d signatures nettoyées\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clef %s : « %s » %d identité nettoyée\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clef %s : « %s » %d identités nettoyées\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clef %s : « %s » n'est pas modifiée\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clef %s : clef secrète importée\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, c-format
msgid "secret key %s: %s\n"
msgstr "clef secrète %s : %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "impossible d'importer des clefs secrètes\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clef %s : « %s » certificat de révocation importé\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clef %s : pas d'identité pour la signature\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clef %s : algorithme à clef publique non pris en charge\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clef %s : signature directe de clef incorrecte\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clef %s : lien à la sous-clef incorrect\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clef %s : révocation de sous-clef incorrecte\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, 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:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clef %s : identité « %s » ignorée\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clef %s : sous-clef ignorée\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clef %s : ajout du certificat de révocation « %s »\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clef %s : ajout de la signature directe de clef\n"
@@@ -3551,61 -2870,53 +3665,67 @@@ msgstr "le trousseau local « %s »
msgid "keyring '%s' created\n"
msgstr "le porte-clefs « %s » a été créé\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "ressource de bloc de clef « %s » : %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening '%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "erreur d'ouverture de « %s » : %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "échec de reconstruction du cache de porte-clefs : %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[révocation]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[autosignature]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 mauvaise signature\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d mauvaises signatures\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signature non vérifiée à cause d'une clef manquante\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signatures non vérifiées à cause de clefs manquantes\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 signature non vérifiée à cause d'une erreur\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signatures non vérifiées à cause d'erreurs\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 identité sans autosignature valable détecté\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d identités sans autosignature valable détecté\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3616,17 -2927,14 +3736,17 @@@ msgstr "
"vérifier les clefs des autres utilisateurs (en regardant les passeports, en\n"
"vérifiant les empreintes depuis diverses sources, etc.)\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = je fais très légèrement confiance\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = je fais entièrement confiance\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3636,47 -2944,40 +3756,52 @@@ msgstr "
"Une profondeur supérieure à 1 permet à la clef que vous signez de faire\n"
"des signatures de confiance de votre part.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Veuillez entrer un domaine pour restreindre cette signature, ou appuyer\n"
"sur la touche entrée pour aucun domaine.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'identité « %s » est révoquée."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Voulez-vous vraiment toujours la signer ? (o/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Impossible de signer.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'identité « %s » est expiré."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'identité « %s » n'est pas autosignée."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'identité « %s » peut être signée. "
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Faut-il la signer ? (o/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3685,11 -2986,9 +3810,11 @@@ msgstr "
"L'autosignature de « %s »\n"
"est une signature de type PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Voulez-vous la modifier en autosignature OpenPGP ? (o/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3698,13 -2997,11 +3823,13 @@@ msgstr "
"Votre signature actuelle de « %s »\n"
"a expiré.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Voulez-vous créer une nouvelle signature pour remplacer celle qui a\n"
"expiré ? (o/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3713,43 -3010,34 +3838,43 @@@ msgstr "
"Votre signature actuelle de « %s »\n"
"est locale.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Voulez-vous la rendre complètement exportable ? (o/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "« %s » a déjà été signée localement par la clef %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "« %s » a déjà été signée par la clef %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Voulez-vous quand même encore la signer ? (o/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Rien à signer avec la clef %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Cette clef a expiré."
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Cette clef va expirer le %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Voulez-vous que votre signature expire en même temps ? (O/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3758,31 -3046,25 +3883,31 @@@ msgstr "
"Avec quel soin avez-vous vérifié que la clef à signer appartient bien à\n"
"la personne sus-nommée ? Si vous ne savez quoi répondre, entrez « 0 ».\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Je ne répondrai pas.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Je n'ai pas vérifié du tout.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) J'ai partiellement vérifié.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) J'ai complètement vérifié.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
msgid "Your selection? (enter '?' for more information): "
msgstr "Quel est votre choix ? (Entrez « ? » pour plus de renseignements) : "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3791,233 -3073,178 +3916,233 @@@ msgstr "
"Voulez-vous vraiment signer cette clef avec votre\n"
"clef « %s » (%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Ce sera une autosignature.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "Attention : la signature ne sera pas marquée comme non exportable.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "Attention : La signature ne sera pas marquée comme non révocable.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "La signature sera marquée comme non exportable.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "La signature sera marquée comme non révocable.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Je n'ai pas du tout vérifié cette clef.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "J'ai partiellement vérifié cette clef.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "J'ai complètement vérifié cette clef.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Voulez-vous vraiment signer ? (o/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "échec de la signature : %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"La clef ne possède que des éléments partiels ou stockés sur carte\n"
"— pas de phrase secrète à modifier.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "clef %s : erreur de modification de la phrase secrète : %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "déplacement d'une signature de clef au bon endroit\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "enregistrer et quitter"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "afficher l'empreinte de la clef"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Entrez le keygrip : "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "afficher la clef et les identités"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "sélectionner l'identité N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "sélectionner la sous-clef N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "vérifier les signatures"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"signer les identités sélectionnées [* voir ci-dessous les commandes "
"similaires]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "signer les identités sélectionnées localement"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "signer les identités sélectionnées avec une signature de confiance"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "signer les identités sélectionnées avec une signature non révocable"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "ajouter une identité"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "ajouter une photo d'identité"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "supprimer les identités sélectionnées"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "ajouter une sous-clef"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "ajouter une clef à une carte à puce"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "déplacer une clef vers une carte à puce"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "déplacer une clef de sauvegarde vers une carte à puce"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "supprimer les sous-clefs sélectionnées"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "ajouter une clef de révocation"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "supprimer les signatures des identités sélectionnées"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
"modifier la date d'expiration de la clef ou des sous-clefs sélectionnées"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "marquer l'identité sélectionnée comme principale"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "afficher les préférences (expert)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "afficher les préférences (bavard)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "définir la liste de préférences pour les identités sélectionnées"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "définir le serveur de clefs favori pour les identités sélectionnées"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "définir une notation pour les identités sélectionnées"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "modifier la phrase secrète"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "modifier la confiance du propriétaire"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "révoquer les signatures des identités sélectionnées"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "révoquer les identités sélectionnées"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "révoquer la clef ou des sous-clefs sélectionnées"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "activer la clef"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "désactiver la clef"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "montrer les photos d'identité sélectionnées"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"compacter les identités inutilisables et supprimer les\n"
" signatures inutilisables de la clef"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"compacter les identités inutilisables et supprimer toutes\n"
" les signatures de la clef"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "La clef secrète est disponible.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "La clef secrète est nécessaire pour faire cela.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4029,250 -3256,194 +4154,251 @@@ msgstr "
" confiance (tsign), « nr » pour les signatures non révocables\n"
" (nrsign), ou toute combinaison possible (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "La clef est révoquée."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Conseil : sélectionner les identités à signer\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Type de signature « %s » inconnu\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Cette commande n'est pas permise en mode %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Vous devez sélectionner au moins une identité.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Faut-il vraiment supprimer toutes les identités sélectionnées ? (o/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Faut-il vraiment supprimer cette identité ? (o/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Vous devez sélectionner exactement une clef.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "La commande attend un nom de fichier comme argument\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Impossible d'ouvrir « %s » : %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Erreur de lecture de la clef de sauvegarde sur « %s » : %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Vous devez sélectionner au moins une clef.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Voulez-vous vraiment supprimer cette clef ? (o/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr ""
"Voulez-vous vraiment révoquer toutes les identités sélectionnées ? (o/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Voulez-vous vraiment révoquer cette identité ? (o/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Voulez-vous vraiment révoquer toute la clef ? (o/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Voulez-vous vraiment révoquer les sous-clefs sélectionnées ? (o/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Voulez-vous vraiment révoquer cette sous-clef ? (o/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"La confiance du propriétaire pourrait ne pas être définie à partir de\n"
"la base de confiance d'un tiers\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Définir la liste de préférences en :\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Faut-il vraiment mettre à jour les préférences pour les\n"
"identités sélectionnées ? (o/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Faut-il enregistrer les modifications ? (o/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Faut-il quitter sans enregistrer ? (o/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "échec de la mise à jour : %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "La clef n'a pas été modifiée donc la mise à jour est inutile.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "clef secrète « %s » introuvable : %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "« %s » n’est pas une empreinte\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "« %s » n’est pas l’empreinte principale\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "No matching user IDs."
msgstr "Pas d’identités correspondantes."
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "Nothing to sign.\n"
msgstr "Rien à signer.\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Hachage : "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Fonctionnalités : "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Serveur de clefs sans modification"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Serveur de clefs favori : "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Notations : "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Il n'y a pas de préférences dans une identité de type PGP 2.x.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "La clef suivante a été révoquée le %s par la clef %s %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Cette clef peut être révoquée par la clef %s %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(sensible)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "créé : %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "révoquée : %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "expirée : %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "expire : %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "utilisation : %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "nº de carte : "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "confiance : %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "validité : %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Cette clef a été désactivée"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4280,17 -3451,12 +4406,17 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "révoquée"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "expirée"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4299,15 -3465,12 +4425,15 @@@ msgstr "
"commande\n"
" risque de rendre une autre identité principale par défaut.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
msgid "You may want to change its expiration date too.\n"
msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4316,79 -3479,62 +4442,79 @@@ msgstr "
"Attention : c'est une clef de type PGP 2. Ajouter une photo d'identité\n"
" peut forcer certaines versions de PGP à rejeter cette clef.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Vous ne devriez pas ajouter de photo d'identité à une clef de type PGP 2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "Cette identité existe déjà pour cette clef.\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Supprimer cette bonne signature ? (o/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Supprimer cette signature inconnue ? (o/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d signature supprimée.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d signatures supprimées\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Rien n'a été supprimé.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "incorrecte"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Identité « %s » compactée : %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Identité « %s » : %d signature supprimée\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Identité « %s » : %d signatures supprimées\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Identité « %s » : déjà minimisée\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Identité « %s » : déjà nettoyée\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4397,194 -3543,164 +4523,206 @@@ msgstr "
"Attention : c'est une clef de type PGP 2.x. Ajouter un révocateur désigné\n"
" peut forcer certaines versions de PGP à rejeter cette clef.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Vous ne pouvez pas ajouter de révocateur désigné à une clef de type PGP 2."
"x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Entrez l'identité du révocateur désigné : "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"impossible d'utiliser une clef de type PGP 2.x comme révocateur désigné.\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"vous ne pouvez pas utiliser une clef comme son propre révocateur désigné\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "cette clef à déjà été désignée comme un révocateur\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"Attention : l'établissement d'une clef comme révocateur désigné\n"
" est irréversible.\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Veuillez sélectionner au plus une sous-clef.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Modification de la date d'expiration d'une sous-clef.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Modification de la date d'expiration de la clef principale.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Vous ne pouvez pas modifier la date d'expiration d'une clef v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "la sous-clef de signature %s a déjà une certification croisée\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"la sous-clef %s ne signe pas et n'a donc pas besoin de certification "
"croisée\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Veuillez sélectionner exactement une identité.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "l'autosignature v3 de l'identité « %s » a été ignorée\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Entrez l'URL de votre serveur de clefs favori : "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Entrez la notation : "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "Faut-il continuer ? (o/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Pas d'identité d'indice %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Pas d'identité avec le hachage %s\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Pas de sous-clef d'indice %d\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "Pas de sous-clef d'indice %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "identité : « %s »\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "signée par votre clef %s le %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Cette signature a expiré le %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Voulez-vous vraiment toujours la révoquer ? (o/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
"Faut-il créer un certificat de révocation pour cette signature ? (o/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "Non signée par vous.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Vous avez signé ces identités sur la clef %s :\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (non révocable)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "révoquée par votre clef %s le %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "pas de clef secrète\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'identité « %s »\" est déjà révoquée.\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"Attention : une signature d'identité date de %d secondes dans le futur\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La clef %s est déjà révoqué.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La sous-clef %s est déjà révoquée.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4628,14 -3736,10 +4766,14 @@@ msgstr "écriture de l'autosignature\n
msgid "writing key binding signature\n"
msgstr "écriture de la signature de lien à la clef\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "taille incorrecte ; utilisation de %u bits\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie à %u bits\n"
@@@ -4926,40 -3981,35 +5064,45 @@@ msgstr "
msgid "Real name: "
msgstr "Nom réel : "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Caractère incorrect dans le nom\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Le nom doit contenir au moins cinq caractères\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Adresse électronique : "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse électronique valable\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Commentaire : "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Caractère incorrect dans le commentaire\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Vous utilisez le jeu de caractères « %s ».\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4970,7 -4020,6 +5113,7 @@@ msgstr "
" « %s »\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Ne mettez pas d'adresse électronique dans le nom réel ou dans le "
@@@ -4987,34 -4036,27 +5130,34 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcAaOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr ""
"Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique ou (Q)uitter ? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique\n"
"ou (O)ui/(Q)uitter ? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Changer le (N)om, l'(A)dresse électronique ou (O)ui/(Q)uitter ? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Veuillez d'abord corriger l'erreur\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5022,7 -4064,6 +5165,7 @@@ msgstr "
"Une phrase secrète est nécessaire pour protéger votre clef secrète.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@@ -5030,17 -4071,14 +5173,17 @@@ msgstr "
"Veuillez entrer une phrase secrète pour protéger la sauvegarde hors carte de "
"la nouvelle clef de chiffrement."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr ""
"la phrase secrète n'a pas été correctement répétée ; veuillez réessayer"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5052,7 -4090,6 +5195,7 @@@ msgstr "
"à tout moment en utilisant ce programme avec l'option « --edit-key ».\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5064,12 -4101,10 +5207,12 @@@ msgstr "
"pendant la génération de nombres premiers ; cela donne au générateur de\n"
"nombres aléatoires une meilleure chance d'obtenir suffisamment d'entropie.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Échec de génération de la clef : %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5080,54 -4115,43 +5223,54 @@@ msgstr "
" « %s »\n"
"\n"
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr "Faut-il continuer ? (O/n) "
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Une clef pour « %s » existe déjà\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
msgid "Create anyway? (y/N) "
msgstr "Faut-il quand même créer ? (o/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
msgid "creating anyway\n"
msgstr "création quand même\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Remarque : Utilisez « %s %s » pour une fenêtre de dialogue de génération de "
"clef complète.\n"
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "La génération de clef a été annulée.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, c-format
msgid "writing public key to '%s'\n"
msgstr "écriture de la clef publique dans « %s »\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "aucun porte-clefs public accessible en écriture n'a été trouvé : %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "les clefs publique et secrète ont été créées et signées.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5136,7 -4160,6 +5279,7 @@@ msgstr "
"pouvez\n"
"utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5144,7 -4167,6 +5287,7 @@@ msgstr "
"la clef a été créée %lu seconde dans le futur (faille temporelle ou\n"
"problème d'horloge)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5152,245 -4174,193 +5295,245 @@@ msgstr "
"la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
"problème d'horloge)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"Remarque : la création de sous-clefs pour des clefs v3 n'est pas compatible\n"
" avec OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parties secrètes de la clef principale ne sont pas disponibles.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr ""
"Les parties secrètes de la clef principale sont stockées sur la carte.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Faut-il vraiment la créer ? (o/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "impossible de stocker la clef sur la carte : %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "impossible de créer le fichier de sauvegarde « %s » : %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Remarque : sauvegarde de la clef de la carte dans « %s »\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "jamais "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politique de signature critique : "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politique de signature : "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Serveur de clefs critique favori : "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notation de signature critique : "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notation de signature : "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 mauvaise signature\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d mauvaises signatures\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr "Attention : %lu clefs ignorées en raison de leur grande taille\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Porte-clefs"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "« %s » a été ignorée : %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Empreinte de clef principale :"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Empreinte de la sous-clef :"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr "Empreinte clef princip. :"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Empreinte de sous-clef :"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Empreinte de la clef ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " Nº de série de carte ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "impossible de renommer « %s » en « %s » : %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, c-format
msgid "caching keyring '%s'\n"
msgstr "mise en cache du porte-clefs « %s »\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu clefs mises en cache pour l'instant (%lu signatures)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu clefs mises en cache (%lu signatures)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s : porte-clefs créé\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "inclure les clefs révoquées dans les résultats de recherche"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "inclure les sous-clefs en cherchant par identifiant de clef"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "récupérer les clefs automatiquement en vérifiant les signatures"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "respecter l'URL de serveur de clefs favori indiqué dans la clef"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
"respecter l'enregistrement PKA positionné sur une clef en récupérant les "
"clefs"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "désactivée"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Entrez le ou les nombres, (S)uivant, ou (Q)uitter > "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocole de serveur de clefs incorrect (nous %d!=gestionnaire %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "« %s » n'est pas un identifiant de clef : ignoré\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "rafraîchissement d'une clef à partir de %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr ""
"Attention : impossible de rafraîchir la clef %s\n"
" avec %s : %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "rafraîchissement de %d clefs à partir de %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "clef « %s » introuvable sur le serveur de clefs\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "clef introuvable sur le serveur de clefs\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "pas de serveur de clefs connu (utilisez l'option --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "demande de la clef %s sur le serveur %s %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "requête de la clef %s sur %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "envoi de la clef %s au serveur %s %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "envoi de la clef %s à %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, c-format
msgid "requesting key from '%s'\n"
msgstr "requête de la clef sur « %s »\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Attention : impossible de récupérer l'URI %s : %s\n"
@@@ -5426,7 -4390,6 +5569,7 @@@ msgid "encrypted with %u-bit %s key, I
msgstr ""
"chiffré avec une clef %2$s de %1$u bits, identifiant %3$s, créée le %4$s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " « %s »\n"
@@@ -5474,220 -4428,171 +5617,215 @@@ msgstr "le déchiffrement a réussi\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Attention : le message chiffré a été manipulé.\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "phrase secrète effacée mise en cache avec l'identifiant : %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "échec du déchiffrement : %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "Remarque : l'expéditeur a demandé « à votre seule attention »\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom de fichier original : « %.*s »\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "Attention : plusieurs textes en clair ont été vus\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "révocation autonome — utilisez « gpg --import » pour l'appliquer\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "aucune signature trouvée\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "MAUVAISE signature de « %s »"
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature expirée de « %s »"
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "Bonne signature de « %s »"
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "vérification de signature supprimée\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "impossible de traiter ces données ambiguës de signature\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Signature faite le %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " avec la clef %s %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Clef disponible sur : "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[doute]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " alias « %s »"
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "La signature a expiré le %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "La signature expire le %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "signature %s, algorithme de hachage %s%s%s\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binaire"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "mode texte"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "inconnu"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
msgid ", key algorithm "
msgstr ", algorithme de clef "
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossible de vérifier la signature : %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "la signature n'est pas détachée\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signature autonome de classe 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "signature d'un ancien type (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "échec du fstat de « %s » dans %s : %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "échec de fstat(%d) dans %s : %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr ""
"Attention : utilisation de l'algorithme expérimental à clef publique %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"Attention : Les clefs de signature et chiffrement Elgamal sont "
"déconseillées\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr ""
"Attention : utilisation de l'algorithme expérimental de chiffrement %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "Attention : utilisation de l'algorithme expérimental de hachage %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "Attention : l'algorithme de hachage %s est déconseillé\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Remarque : les signatures utilisant l’algorithme %s sont rejetées\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s : %d : option « %s » déconseillée\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "Attention : « %s » est une option déconseillée\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "veuillez plutôt utiliser « %s%s »\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "Attention : « %s » est une commande déconseillée — ne l'utilisez pas\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
"%s : %u : « %s » est obsolète dans ce fichier — n’est prise en compte que "
"dans %s\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5695,37 -4600,35 +5833,43 @@@ msgstr "
"Attention : « %s%s » est une option obsolète — non prise en compte à part "
"dans %s\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Non compressé"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "non compressé|non|sans"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "ce message ne sera pas utilisable par %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "option « %s » ambiguë\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, c-format
msgid "unknown option '%s'\n"
msgstr "option « %s » inconnue\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"une clef publique ECDSA est censée être dans un encodage SEC multiple de "
"8 bits\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type '%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Type de signature « %s » inconnu\n"
+
+#: g10/openfile.c:85
#, c-format
msgid "File '%s' exists. "
msgstr "Le fichier « %s » existe. "
@@@ -5926,31 -4796,24 +6070,31 @@@ msgstr "Cette photo est-elle correcte (
msgid "unable to display photo ID!\n"
msgstr "impossible d'afficher la photo d'identité.\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Aucune cause indiquée"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "La clef a été remplacée"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "La clef a été compromise"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "La clef n'est plus utilisée"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "L'identité n'est plus valable"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "cause de révocation : "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "commentaire de révocation : "
@@@ -5964,54 -4827,43 +6108,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "rRmMqQiI"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Pas de valeur de confiance définie pour :\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " alias « %s »\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"Quelle confiance portez-vous au fait que cette\n"
"clef appartienne bien à l'utilisateur nommé ?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = je ne sais pas ou n'ai pas d'avis\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = je ne fais PAS confiance\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = j'attribue une confiance ultime\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = retour au menu principal\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " i = ignorer cette clef\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " q = quitter\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6020,42 -4872,34 +6164,42 @@@ msgstr "
"Le niveau de confiance minimal pour cette clef est : %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Quelle est votre décision ? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr ""
"Voulez-vous vraiment attribuer une confiance ultime à cette clef ? (o/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificats conduisant vers une clef de confiance ultime :\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s : aucune assurance que la clef appartienne vraiment à l'utilisateur "
"nommé.\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s : faible assurance que la clef appartienne vraiment à l'utilisateur "
"nommé.\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Cette clef appartient sans doute à l'utilisateur nommé\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Cette clef nous appartient\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6066,118 -4910,93 +6210,118 @@@ msgstr "
"faites, vous pouvez répondre oui à la prochaine question.\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "Faut-il quand même utiliser cette clef ? (o/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "Attention : utilisation d'une clef sans confiance.\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr ""
" Cela pourrait signifier que la signature est contrefaite.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Remarque : cette clef a été désactivée.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, 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:588
++#: g10/pkclist.c:589
#, 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:600
++#: g10/pkclist.c:601
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:608
++#: g10/pkclist.c:609
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:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Remarque : cette clef a expiré.\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "Attention : nous n'avons PAS confiance en cette clef.\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " La signature est sans doute CONTREFAITE.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s : ignoré : %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s : ignoré : la clef publique est désactivée\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s : ignoré : clef publique déjà présente\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Destinataires actuels :\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6185,76 -5004,59 +6329,76 @@@ msgstr "
"\n"
"Entrez l'identité, en terminant par une ligne vide : "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Cette identité n'existe pas.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "La clef publique est désactivée.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "ignoré : clef publique déjà activée\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinataire par défaut « %s » inconnu\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "pas de destinataire valable\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, 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:1566
++#: g10/pkclist.c:1568
#, 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"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"les données ne sont pas enregistrées ; utilisez l'option « --output » pour\n"
"les enregistrer\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, c-format
msgid "error creating '%s': %s\n"
msgstr "erreur de création de « %s » : %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Signature détachée.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Entrez le nom du fichier de données : "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "lecture de l'entrée standard…\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "pas de données signées\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "impossible d'ouvrir les données signées « %s »\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "impossible d'ouvrir les données signées fd=%d : %s\n"
@@@ -6294,8 -5089,6 +6438,8 @@@ msgstr "Remarque : la clef secrète %
msgid "Note: key has been revoked"
msgstr "Remarque : la clef a été révoquée"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "échec de build_packet : %s\n"
@@@ -6305,42 -5097,38 +6449,48 @@@
msgid "key %s has no user IDs\n"
msgstr "la clef %s n'a pas d'identité\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "À révoquer par :\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(c'est une clef de révocation sensible)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "La clef secrète est disponible.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr ""
"Faut-il créer un certificat de révocation désigné pour cette clef ? (o/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "sortie forcée avec armure ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "échec de make_keysig_packet : %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Certificat de révocation créé.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "aucune clef de révocation trouvée pour « %s »\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Ceci est un certificat de révocation pour la clef OpenPGP :"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6352,7 -5140,6 +6502,7 @@@ msgstr "
"encore accessible, créer un nouveau certificat de révocation\n"
"est préférable afin d’indiquer la cause de révocation."
- #: g10/revoke.c:564
++#: g10/revoke.c:572
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"
@@@ -6363,11 -5150,21 +6513,25 @@@ msgstr "
"Supprimez ce deux-points avec un éditeur de texte avant\n"
"d’utiliser ce certificat de révocation."
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "clef secrète « %s » introuvable : %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Faut-il créer un certificat de révocation pour cette clef ? (o/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6388,34 -5185,27 +6552,34 @@@ msgstr "
"d'impression\n"
"utilisé pourrait stocker ces données et les rendre accessibles à d'autres.\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "choisissez la cause de la révocation :\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Annuler"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Vous devriez sûrement sélectionner %d ici)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"Entrez une description facultative, en terminant par une ligne vide :\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Cause de révocation : %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Aucune description donnée)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Est-ce d'accord ? (o/N) "
@@@ -6441,39 -5227,32 +6605,39 @@@ msgid "%s key %s requires a %zu bit or
msgstr ""
"la clef %s %s nécessite un hachage d'au moins %zu bits (le hachage est %s)\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "Attention : conflit de hachage de signature dans le message\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
"Attention : la sous-clef de signature %s n'a pas de certificat croisé\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "veuillez consulter %s pour plus de renseignements\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"Attention : la sous-clef de signature %s a un certificat croisé incorrect\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "la clef publique %s est plus récente de %lu seconde que la signature\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr ""
"la clef publique %s est plus récente de %lu secondes que la signature\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6481,7 -5260,6 +6645,7 @@@ msgstr "
"la clef %s a été créée %lu seconde dans le futur\n"
"(faille temporelle ou problème d'horloge)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6489,30 -5267,25 +6653,30 @@@ msgstr "
"la clef %s a été créée %lu secondes dans le futur\n"
"(faille temporelle ou problème d'horloge)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Remarque : la clef de signature %s a expiré le %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Remarque : la clef de signature %s a été révoquée\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"la signature de la clef %s est supposée être fausse car un bit\n"
"critique est inconnu\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"clef %s : pas de sous-clef pour la signature de révocation de sous-clef\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "clef %s : pas de sous-clef pour la signature de lien à la sous-clef\n"
@@@ -6561,33 -5328,27 +6725,33 @@@ msgstr "
msgid "signing:"
msgstr "signature :"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "le chiffrement %s sera utilisé\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"la clef n'est pas marquée comme non sécurisée — elle ne peut pas être\n"
"utilisée avec le soi-disant générateur de nombres aléatoires.\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "« %s » a été ignorée : en double\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "ignoré : clef secrète déjà présente\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"c'est une clef Elgamal générée par PGP qui n'est pas sûre pour les "
"signatures."
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "enregistrement de confiance %lu, type %d : échec d'écriture : %s\n"
@@@ -6632,7 -5385,6 +6796,7 @@@ msgstr "impossible de trouver l'enregis
msgid "read error in '%s': %s\n"
msgstr "erreur de lecture dans « %s » : %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de confiance : échec de synchronisation : %s\n"
@@@ -6662,7 -5409,6 +6826,7 @@@ msgstr "
msgid "trustdb transaction too large\n"
msgstr "transaction de base de confiance trop grande\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "impossible d'accéder à « %s » : %s\n"
@@@ -6776,121 -5499,98 +6940,121 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "« %s » n'est pas un identifiant valable de clef longue\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "clef %s : acceptée comme clef de confiance\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "la clef %s apparaît plusieurs fois dans la base de confiance\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "clef %s : pas de clef publique pour la clef de confiance — ignorée\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "clef %s marquée de confiance ultime.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr ""
"enregistrement de confiance %lu, type de requête %d : échec de lecture : %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "l'enregistrement de confiance %lu n'est pas du type %d demandé\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
"Vous pourriez essayer de recréer la base de confiance avec les commandes :\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "Si cela ne fonctionne pas, veuillez consulter le mode d'emploi\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"impossible d'utiliser ce modèle de confiance inconnu (%d) —\n"
" utilisation du modèle de confiance %s à la place\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "utilisation du modèle de confiance %s\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "inutile de vérifier la base de confiance\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr ""
"inutile de vérifier la base de confiance avec le modèle de\n"
" confiance « %s »\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr ""
"inutile de mettre à jour la base de confiance avec le modèle de\n"
" confiance « %s »\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "clef publique %s introuvable : %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "veuillez faire un --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "vérification de la base de confiance\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d clefs traitées (%d comptes de validité réinitialisés)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "aucune clef de confiance ultime n'a été trouvée\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "la clef publique de la clef de confiance ultime %s est introuvable\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
"%d marginale(s) nécessaire(s), %d complète(s) nécessaire(s),\n"
" modèle de confiance %s\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -6898,7 -5598,6 +7062,7 @@@ msgstr "
"profondeur : %d valables : %3d signées : %3d\n"
" confiance : %d i., %d n.d., %d j., %d m., %d t., %d u.\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7146,11 -5796,9 +7310,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "échec de vérification CHV%d : %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "erreur de récupération de l'état CHV de la carte\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "la carte est irrémédiablement bloquée.\n"
@@@ -7291,14 -5911,12 +7455,14 @@@ msgstr "la carte ne gère pas l'algorit
msgid "signatures created so far: %lu\n"
msgstr "signatures créées jusqu'à présent : %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"la vérification du code personnel d'administration est actuellement\n"
"interdite avec cette commande\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
@@@ -7320,7 -5935,6 +7484,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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
@@@ -7378,12 -5980,10 +7542,12 @@@ msgstr "
"veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
"en arrière-plan\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "gestionnaire pour le descripteur %d démarré\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "gestionnaire pour le descripteur %d terminé\n"
@@@ -7813,7 -6321,6 +7977,7 @@@ msgstr "ligne %d : erreur de lecture
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "ligne %d : échec de génération de la clef : %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8401,7 -6788,6 +8565,7 @@@ msgstr "certificats chargés de façon
msgid " runtime cached certificates: %u\n"
msgstr " certificats actuellement en cache : %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
msgid "certificate already cached\n"
msgstr "certificat déjà en cache\n"
@@@ -8409,8 -6794,6 +8573,8 @@@
msgid "certificate cached\n"
msgstr "certificat en cache\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, c-format
msgid "error caching certificate: %s\n"
msgstr "erreur de mise en cache du certificat : %s\n"
@@@ -8469,7 -6841,6 +8633,7 @@@ msgstr "suppression du fichier de cach
msgid "not removing file '%s'\n"
msgstr "pas de suppression du fichier « %s »\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, c-format
msgid "error closing cache file: %s\n"
msgstr "erreur de fermeture du fichier de cache : %s\n"
@@@ -8709,168 -7036,138 +8873,168 @@@ 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:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "algorithme de hachage « %s » inconnu\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr "échec de gcry_md_open pour l'algorithme %d : %s\n"
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr "expression symbolique incorrecte obtenue de libksba\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, c-format
msgid "converting S-expression failed: %s\n"
msgstr "échec de conversion d'expression symbolique : %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "échec de création d'expression symbolique : %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, c-format
msgid "ksba_crl_parse failed: %s\n"
msgstr "échec de ksba_crl_parse : %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, c-format
msgid "error getting update times of CRL: %s\n"
msgstr ""
"erreur de lecture des dates de mises à jour de la liste de révocations de "
"certificat : %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
"dates de mises à jour de la liste de révocations de certificat : celle-ci=%s "
"prochaine=%s\n"
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr "nextUpdate non donné ; période de validité supposée d'un jour\n"
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, c-format
msgid "error getting CRL item: %s\n"
msgstr ""
"erreur de lecture de l'élément de liste de révocations de certificat : %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "erreur d'insertion d'élément dans le fichier cache temporaire : %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr ""
"aucun émetteur de liste de révocations de certificat trouvé dans la liste : "
"%s\n"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
"localisation du certificat d'émetteur de liste de révocations par "
"authorityKeyIdentifier\n"
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, c-format
msgid "CRL signature verification failed: %s\n"
msgstr ""
"échec de vérification de signature de liste de révocations de certificat : "
"%s\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr ""
"erreur de vérification de la validité du certificat d'émetteur de liste de "
"révocations : %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "échec de ksba_crl_new : %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "échec de ksba_crl_set_reader : %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "vieux fichier de cache temporaire « %s » supprimé\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr ""
"problème de suppression du vieux fichier de cache temporaire « %s » : %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "erreur de création du fichier de cache temporaire « %s » : %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, c-format
msgid "crl_parse_insert failed: %s\n"
msgstr "échec de crl_parse_insert : %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "erreur de finalisation du fichier de cache temporaire « %s » : %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "erreur de fermeture du fichier de cache temporaire « %s » : %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
"Attention : la nouvelle liste de révocations de certificat est trop "
"ancienne ; elle a expiré le %s — chargement quand même\n"
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
"la nouvelle liste de révocations de certificat est trop ancienne ; elle a "
"expiré le %s\n"
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr "extension %s de liste de révocations de certificat critique inconnue\n"
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, c-format
msgid "error reading CRL extensions: %s\n"
msgstr ""
"erreur de lecture des extensions de liste de révocations de certificat : %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, c-format
msgid "creating cache file '%s'\n"
msgstr "création du fichier de cache « %s »\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "problème en renommant « %s » en « %s » : %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
@@@ -8878,14 -7175,12 +9042,14 @@@ msgstr "
"échec de mise à jour du fichier DIR — l'entrée de cache sera perdue avec le "
"prochain démarrage du programme\n"
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
"Démarrage du vidage de liste de révocations de certificat (récupérée par "
"%s)\n"
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
@@@ -8893,58 -7188,47 +9057,58 @@@ msgstr "
" Erreur : la liste de révocations de certificat ne sera pas utilisée car "
"elle était encore trop ancienne après une mise à jour.\n"
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
" Erreur : la liste de révocations de certificat ne sera pas utilisée à cause "
"d'une extension critique inconnue.\n"
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
" Erreur : la liste de révocations de certificat ne sera pas utilisée.\n"
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
" Erreur : cette liste de révocations de certificat en cache a pu être "
"modifiée.\n"
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
msgid " WARNING: invalid cache record length\n"
msgstr " Attention : taille d'enregistrement de cache incorrecte\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, c-format
msgid "problem reading cache record: %s\n"
msgstr "problème de lecture d'enregistrement de cache : %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, c-format
msgid "problem reading cache key: %s\n"
msgstr "problème de lecture d'enregistrement de clef : %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "erreur de lecture de l'entrée de cache dans la base de données : %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr "Fin du vidage de liste de révocations de certificat\n"
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "échec de crl_fetch par points de distribution : %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "échec de crl_cache_insert par points de distribution : %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "échec de crl_cache_insert par émetteur : %s\n"
@@@ -8990,11 -7264,9 +9154,11 @@@ msgstr "erreur de récupération de «�
msgid "error retrieving '%s': http status %u\n"
msgstr "erreur de récupération de « %s » : état HTTP %u\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
#| msgid "CRL access not possible due to disabled %s\n"
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr ""
"accès à la liste de révocations de certificat impossible car %s est "
"désactivé\n"
@@@ -9004,56 -7275,43 +9168,56 @@@
msgid "certificate search not possible due to disabled %s\n"
msgstr "recherche de certificats impossible car %s est désactivé\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr "utiliser OCSP au lieu des listes de révocations de certificat"
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr "vérifier si une instance de dirmngr fonctionne"
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
msgid "add a certificate to the cache"
msgstr "ajouter un certificat au cache"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
msgid "validate a certificate"
msgstr "valider un certificat"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
msgid "lookup a certificate"
msgstr "rechercher un certificat"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
msgid "lookup only locally stored certificates"
msgstr "rechercher seulement les certificats localement"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr "exiger une URL pour --lookup"
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr "charger une liste de rév. de cert. dans dirmngr"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr "mode spécial pour être utilisé par Squid"
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
msgid "expect certificates in PEM format"
msgstr "attendre les certificats au format PEM"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
msgstr "forcer utilisation du répondeur OCSP par défaut"
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
"Utilisation : dirmngr-client [options] [fic_cert|motif] (-h pour l'aide)\n"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9066,226 -7324,152 +9230,196 @@@ msgstr "
"Le processus renvoie 0 si le certificat est valable, 1 s'il est\n"
"incorrect et d'autres codes d'erreurs pour les problèmes globaux\n"
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "erreur de lecture du certificat sur l'entrée standard : %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "erreur de lecture du certificat sur « %s » : %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr "certificat trop grand pour être possible\n"
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, c-format
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "impossible de se connecter au dirmngr : %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, c-format
msgid "lookup failed: %s\n"
msgstr "échec de la recherche : %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr ""
"échec de chargement de la liste de révocations de certificat « %s » : %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr "un démon dirmngr fonctionne et est disponible\n"
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "échec de validation du certificat : %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
msgid "certificate is valid\n"
msgstr "le certificat est valable\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
msgid "certificate has been revoked\n"
msgstr "le certificat a été révoquée\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, c-format
msgid "certificate check failed: %s\n"
msgstr "échec de vérification du certificat : %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr "état obtenu : « %s »\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "erreur d'écriture en encodage base64 : %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "échec d'allocation du contexte Assuan : %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr "pas d'instance de dirmngr en cours d'exécution apparemment\n"
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
- "pas d'instance de dirmngr en cours d'exécution —\n"
- "démarrage d'une nouvelle instance\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr "la variable d'environnement %s est mal définie\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "le protocole dirmngr version %d n'est pas pris en charge\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
- "impossible de se connecter au dirmngr — essai avec la solution de repli\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "impossible de se connecter au dirmngr : %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "demande « %s » non prise en charge\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr "nom de fichier absolu attendu\n"
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr "recherche de « %s »\n"
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr "exécuter en service Windows (arrière-plan)"
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
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:160
++#: dirmngr/dirmngr.c:162
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:161
++#: dirmngr/dirmngr.c:163
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:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr "arrêter le dirmngr"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr "vider le cache"
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
msgid "run without asking a user"
msgstr "exécuter sans demander à l'utilisateur"
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr "permettre l'envoi de requêtes OCSP"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr "interdire l'utilisation d'HTTP"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr "interdire l'utilisation de LDAP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
"ignorer les points de distribution de liste de révocations de certificat en "
"HTTP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
"ignorer les points de distribution de liste de révocations de certificat en "
"LDAP"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignorer les URL de service OCSP contenues dans le certificat"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 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:207
++#: dirmngr/dirmngr.c:209
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|utiliser le répondeur OCSP à l'URL"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr "|EMPR|réponse OCSP signée par EMPR"
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
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:219
++#: dirmngr/dirmngr.c:222
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:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9295,11 -7479,9 +9429,11 @@@ msgstr "
"(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9308,79 -7490,62 +9442,79 @@@ msgstr "
"Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
"@GNUPG@\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "les niveaux de débogage possibles sont : %s\n"
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, c-format
msgid "usage: %s [options] "
msgstr "utilisation : %s [options] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, 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:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, 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:1582
++#: dirmngr/dirmngr.c:1591
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s : %u : ligne trop longue — ignorée\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s : %u : empreinte incorrecte détectée\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s : %u : erreur de lecture : %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, 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:1794
++#: dirmngr/dirmngr.c:1804
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:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 reçu — aucune action définie\n"
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM reçu — arrêt…\n"
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM reçu — encore %d connexions actives\n"
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
msgid "shutdown forced\n"
msgstr "arrêt forcé\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT reçu — arrêt immédiat\n"
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "signal %d reçu — aucune action définie\n"
@@@ -9622,12 -7736,10 +9756,12 @@@ msgstr "ajout de « %s : %d » à l
msgid "malloc failed: %s\n"
msgstr "échec de malloc : %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch : motif « %s » incorrect\n"
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search a atteint la taille limite du serveur\n"
@@@ -9659,13 -7765,11 +9793,13 @@@ msgstr "erreur de lecture du répondeur
msgid "response from server too large; limit is %d bytes\n"
msgstr "réponse trop grande du serveur ; limitée à %d octets.\n"
+#: dirmngr/ocsp.c:139
#, fuzzy
#| msgid "OCSP request not possible due to disabled HTTP\n"
- msgid "OCSP request not possible due to TOR mode\n"
+ msgid "OCSP request not possible due to Tor mode\n"
msgstr "requête OCSP impossible car HTTP est désactivé\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr "requête OCSP impossible car HTTP est désactivé\n"
@@@ -9809,71 -7883,60 +9943,76 @@@ msgstr "le répondeur OCSP a renvoyé u
msgid "OCSP responder returned an too old status\n"
msgstr "le répondeur OCSP a renvoyé un trop vieil état\n"
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "échec d'assuan_inquire(%s) : %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr "ldapserver manquant"
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr "serialno manquant dans l'identifiant de certificat"
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "échec d'assuan_inquire : %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "échec de fetch_cert_by_url : %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, c-format
msgid "error sending data: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "échec de start_cert_fetch : %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "échec de fetch_next_cert : %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d dépassé\n"
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossible d'allouer une structure de contrôle : %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "échec d'allocation du contexte Assuan : %s\n"
+
++#: dirmngr/server.c:2430
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "impossible d'initialiser le serveur : %s\n"
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problème d'accept_assuan : %s\n"
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "problème de traitement Assuan : %s\n"
@@@ -10129,13 -8132,11 +10268,13 @@@ msgstr "Options contrôlant le format d
msgid "Options controlling the interactivity and enforcement"
msgstr "Options contrôlant l'interactivité et la mise en application"
+#: tools/gpgconf-comp.c:911
#, fuzzy
#| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr "Options contrôlant la sécurité"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "Configuration pour les serveurs HTTP"
diff --cc po/gl.gmo
index 846a955,0000000..5605df4
mode 100644,000000..100644
Binary files differ
diff --cc po/gl.po
index f1dc570,f797ee2..cdb97bf
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
"Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@@ -68,7 -57,6 +68,7 @@@ msgstr "contrasinal incorrecto
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -78,75 -66,59 +78,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "contrasinal err�neo"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "li�a longa de m�is\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "contrasinal demasiado longo\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Caracter non v�lido no nome\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "MPI err�neo"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "contrasinal err�neo"
@@@ -156,25 -127,11 +156,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -247,11 -191,9 +247,11 @@@ msgstr "Por favor, introduza o contrasi
msgid "failed to create stream from socket: %s\n"
msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -395,42 -311,28 +395,42 @@@ msgstr "
"Opci�ns:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "lareto"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser un pouqui�o m�is calado"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 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:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -515,11 -400,6 +515,11 @@@ msgstr "non est� soportado
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@@ -537,145 -415,107 +537,144 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "non foi posible crear %s: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Revocaci�n de certificado v�lida"
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directorio creado\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "o segredo da actualizaci�n fallou: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
@@@ -691,8 -529,6 +690,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -700,9 -536,6 +699,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -756,7 -581,6 +755,7 @@@ msgstr "Cancelar
msgid "error while asking for the passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -939,8 -729,6 +938,8 @@@ msgstr "erro ao crea-lo contrasinal: %s
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -1093,7 -849,6 +1092,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1112,7 -864,6 +1111,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1410,7 -1101,6 +1409,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "non procesado"
@@@ -1594,19 -1246,14 +1593,19 @@@ msgstr "erro ao p�r '%s' na base de dat
msgid "Enter passphrase: "
msgstr "Introduza o contrasinal: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "a chave secreta non est� dispo�ible"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
@@@ -1621,222 -1266,171 +1620,222 @@@ msgstr "Non se admite este comando no m
msgid "Reset Code not or not anymore available\n"
msgstr "hai partes da chave secreta non dispo�ibles\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "�A s�a selecci�n? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "Non se especificou un motivo"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "non procesado"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "non hai unha chave p�blica correspondente: %s\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "preferencias actualizadas"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "caracter non v�lido na cadea de preferencias\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "caracter non v�lido na cadea de preferencias\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "Pegada dactilar:"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "A xeraci�n da chave fallou: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "non se atoparon datos OpenPGP v�lidos.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "�Qu� tama�o de chave quere? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "�Qu� tama�o de chave quere? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "�Qu� tama�o de chave quere? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeado a %u bits\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "om�tese: a chave secreta xa est� presente\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1844,155 -1438,120 +1843,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Por favor, seleccione o tipo de chave que quere:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (s� cifrar)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Selecci�n non v�lida.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Por favor, escolla o motivo da revocaci�n:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Non se admite este comando no modo %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "om�tese: a chave secreta xa est� presente\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "�Asinar de verdade? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "sa�r deste men�"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "amosar esta axuda"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "Chave dispo�ible en: "
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "cambia-la fecha de expiraci�n"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "cambia-la confianza sobre o dono"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "amosar fingerprint"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "xerar un novo par de chaves"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Comando incorrecto (tente \"help\")\n"
@@@ -2000,79 -1558,65 +1999,85 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output non traballa con este comando\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, 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:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "non se atopou a chave `%s': %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(a menos que especifique a chave por pegada dactilar)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr ""
"iso non se pode facer no modo de procesamento por lotes sen \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "�Borrar esta chave do chaveiro? "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "�Esta � unha chave secreta! - �est� seguro de que quere borrala? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "chave"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "P�blica: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "borrouse a informaci�n de confianza\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -2126,7 -1662,6 +2131,7 @@@ msgid "forcing symmetric cipher %s (%d
msgstr ""
"forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
@@@ -2213,289 -1732,242 +2218,309 @@@ msgstr "AVISO: non se puido borra-lo fi
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"A sinatura hase marcar coma non revocable.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "chave secreta non utilizable"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "AVISO: non se exportou nada\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[Non se atopou o id de usuario]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "Pegada dactilar:"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "non se atopou a chave secreta `%s': %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "opci�ns de importaci�n non v�lidas\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NOME|empregar NOME coma chave secreta por defecto"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "cifrar datos"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "cifrar s� con cifrado sim�trico"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "verificar unha sinatura"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "ve-la lista de chaves"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "ve-la lista de chaves e sinaturas"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "xerar un certificado de revocaci�n"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "borrar chaves do chaveiro p�blico"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "borrar chaves do chaveiro secreto"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "asinar ou editar unha chave"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "cambia-lo contrasinal"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "exportar chaves a un servidor de chaves"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importar chaves dun servidor de chaves"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "buscar chaves nun servidor de chaves"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "actualizar t�dalas chaves dun servidor de chaves"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importar/mesturar chaves"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "actualiza-la base de datos de confianza"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "crear sa�da con armadura en ascii"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "empregar este id de usuario para asinar ou descifrar"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, 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:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "non facer ning�n cambio"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "avisar antes de sobrescribir"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2503,7 -1975,6 +2528,7 @@@ msgstr "
"@\n"
"(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2523,13 -1994,11 +2548,13 @@@ msgstr "
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2544,7 -2013,6 +2569,7 @@@ msgstr "
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2552,589 -2020,515 +2577,654 @@@ msgstr "
"\n"
"Algoritmos soportados:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "P�blica: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Compresi�n: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opci�ns] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "amosar en que chaveiro est� unha chave listada"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, 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:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "deshabilitar unha chave"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "destinatario por defecto `%s' desco�ecido\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "destinatario por defecto `%s' desco�ecido\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: �%s non � para uso normal!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, 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:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, 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:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, 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:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, 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:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s non se admite con %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth debe valer entre 1 e 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non v�lidas\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non v�lidas\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non v�lidas\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresi�n personais non v�lidas\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�%s a�nda non traballa con %s!\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, 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:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "algoritmo de hash non v�lido `%s'\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "algoritmo de hash non v�lido `%s'\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [ficheiro]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [ficheiro]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [ficheiro]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [ficheiro]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ficheiro]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [ficheiro]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [ficheiro]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key id-de-usuario"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key id-de-usuario"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-de-usuario [comandos]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-de-usuario"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o env�o ao servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepci�n do servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, 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:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "erro ao crea-lo contrasinal: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[ficheiro]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a s�a mensaxe ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
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:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "toma-las chaves deste chaveiro"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "converte-los conflictos de selo de data nun aviso"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|DF|escribi-la informaci�n de estado a este DF"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3310,7 -2670,6 +3400,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: non hai ID de usuario\n"
@@@ -3320,7 -2678,6 +3410,7 @@@
msgid "key %s: %s\n"
msgstr "om�tese `%s': %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3343,7 -2696,6 +3433,7 @@@ msgstr "chave %08lX: non hai IDs de usu
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica non atopada: %s\n"
@@@ -3353,271 -2704,234 +3443,286 @@@
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: nova chave - omitida\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, 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:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "escribindo a `%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: non coincide coa nosa copia\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, 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:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" sen cambios\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, 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:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, 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:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, 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:2090
++#: g10/import.c:2132
#, 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:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: omitido o ID de usuario '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: omitida a sub-chave\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
@@@ -3644,61 -2954,52 +3749,66 @@@ msgstr "chaveiro `%s' creado\n
msgid "keyring '%s' created\n"
msgstr "chaveiro `%s' creado\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "erro lendo `%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[revocaci�n]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[auto-sinatura]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 sinatura err�nea\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d sinaturas err�neas\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 sinatura non verificada debido a unha chave que falta\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 sinatura non verificada debido a un erro\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d sinaturas non verificadas debido a erros\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3710,63 -3011,53 +3820,68 @@@ msgstr "
"correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
"comprobando pegadas dactilares de varias fontes...).\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Conf�o marxinalmente\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Conf�o totalmente\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "O ID de usuario \"%s\" est� revocado."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�Est� seguro de que quere asinalo? (s/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Non se puido asinar.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "O ID de usuario \"%s\" est� caducado."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "�Asinar de verdade? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3775,11 -3066,9 +3890,11 @@@ msgstr "
"A auto-sinatura de \"%s\"\n"
"� unha sinatura tipo PGP 2.x\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3788,11 -3077,9 +3903,11 @@@ msgstr "
"A s�a sinatura actual en \"%s\"\n"
"caducou.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3801,43 -3088,34 +3916,43 @@@ msgstr "
"A s�a sinatura actual en \"%s\"\n"
"� unha sinatura local.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que asinar coa chave %08lX\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "�Esta chave caducou!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave ha caducar o %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3846,32 -3124,26 +3961,32 @@@ msgstr "
"�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
"persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Non hei respostar.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Non o comprobei en absoluto.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Fixen algunhas comprobaci�ns.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3880,275 -3152,220 +3995,275 @@@ msgstr "
"�Esta seguro de que quere asinar esta chave\n"
"coa s�a chave: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Esta ha ser unha auto-sinatura.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"AVISO: a sinatura non se ha marcar coma non exportable.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"AVISO: A sinatura non se ha marcar coma non revocable.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"A sinatura hase marcar coma non exportable.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"A sinatura hase marcar coma non revocable.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Non se comprobou esta chave en absoluto.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Comprobouse esta chave de xeito informal.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Comprobouse esta chave con moito tino.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "�Asinar de verdade? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "movendo a sinatura dunha chave � seu sitio\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "gardar e sa�r"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "amosar fingerprint"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Notaci�n de sinaturas: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "listar chave e IDs de usuario"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "selecciona-lo ID de usuario N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "selecciona-lo ID de usuario N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "revocar sinaturas"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "asina-la chave localmente"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "engadir un ID de usuario"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "engadir unha identificaci�n fotogr�fica"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "borrar un ID de usuario"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "borrar unha chave secundaria"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "engadir unha chave de revocaci�n"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marcar un ID de usuario coma primario"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "lista-las preferencias (expertos)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "lista-las preferencias (moitos datos)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "cambia-lo contrasinal"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "cambia-la confianza sobre o dono"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revocar un ID de usuario"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revocar unha chave secundaria"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "habilitar unha chave"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "deshabilitar unha chave"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "amosa-la identificaci�n fotogr�fica"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "A chave secreta est� disponible.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "C�mpre a chave secreta para facer isto.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4156,269 -3373,212 +4271,269 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "A chave est� revocada."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "clase de sinatura desco�ecida"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Non se admite este comando no modo %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar alomenos un ID de usuario.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "�Seguro de que quere borrar este ID de usuario? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "�Seguro de que quere borrar este ID de usuario? "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Debe seleccionar alomenos unha chave.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar alomenos unha chave.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "�Seguro de que quere borrar esta chave? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "�Seguro de que quere revocar este ID de usuario? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "�Realmente quere revocar esta chave? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "�Realmente quere revoca-las chaves seleccionadas? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "�Realmente quere revocar esta chave? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estabrece-la lista de preferencias"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "�Realmente desexa actualiza-las preferencias? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "�Garda-los cambios? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "�Sa�r sin gardar? "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "non se atopou a chave secreta `%s': %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Non hai tal ID de usuario.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nada que asinar coa chave %08lX\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Resumo: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Caracter�sticas: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Notaci�n: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Esta chave pode estar revocada por %s chave "
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Esta chave pode estar revocada por %s chave "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (sensible)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "non foi posible crear %s: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocada] "
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " confianza: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confianza: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Esta chave est� desactivada"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4426,19 -3586,14 +4541,19 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revocada] "
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4446,17 -3601,14 +4561,17 @@@ msgstr "
"AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
" facer que un ID de usuario diferente se converta no primario.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4465,81 -3617,64 +4580,81 @@@ msgstr "
"AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
" fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de que quere engadila? (s/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
"PGP2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta sinatura correcta? (s/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Borrada %d sinatura.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Borradas %d sinaturas.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Non se borrou nada.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
#, fuzzy
msgid "invalid"
msgstr "armadura non v�lida"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "O ID de usuario \"%s\" est� revocado."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "O ID de usuario \"%s\" est� revocado."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "O ID de usuario \"%s\" est� revocado."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4549,201 -3684,167 +4664,209 @@@ msgstr "
"designado\n"
" pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduza o ID de usuario do revocador designado: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
"se pode desfacer!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
"se pode desfacer!\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Escolla exactamente un ID de usuario.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�Est� seguro de que quere empregala (s/N)? "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�Est� seguro de que quere empregala (s/N)? "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Notaci�n de sinaturas: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�Sobrescribir? (s/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Non hai ID de usuario con �ndice %d\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " asinada por %08lX no %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta sinatura caducou o %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�Est� seguro de que quere revocala? (s/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " asinada por %08lX no %s%s\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Asinou estes IDs de usuario: \n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocada por %08lX no %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Est� a punto de revocar estas sinaturas:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "non hai chave secreta\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4786,14 -3879,10 +4909,14 @@@ msgstr "escribindo a propia sinatura\n
msgid "writing key binding signature\n"
msgstr "escribindo unha sinatura que liga a chave\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tama�o de chave non v�lido; empregando %u bits\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tama�o de chave redondeado a %u bits\n"
@@@ -5091,41 -4131,36 +5214,46 @@@ msgstr "
msgid "Real name: "
msgstr "Nome: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Caracter non v�lido no nome\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "O nome non pode comezar cun d�xito\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "O nome debe ter alomenos 5 caracteres\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Enderezo de E-mail: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Non � un enderezo de e-mail v�lido\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Comentario: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Car�cter non v�lido no comentario\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5136,7 -4171,6 +5264,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
@@@ -5152,35 -4186,28 +5280,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeAaSs"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Por favor, corrixa antes o erro\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5188,23 -4215,19 +5316,23 @@@ msgstr "
"Necesita un contrasinal para protexe-la s�a chave secreta.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5216,7 -4239,6 +5344,7 @@@ msgstr "
"momento, empregando este programa coa opci�n \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5228,12 -4250,10 +5356,12 @@@ msgstr "
"mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
"n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeraci�n da chave fallou: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5241,58 -4261,47 +5369,58 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' xa est� comprimido\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "�Crear de t�dolos xeitos? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "�Crear de t�dolos xeitos? "
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Cancelouse a xeraci�n de chaves.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "gravando a chave p�blica en `%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5302,7 -4311,6 +5430,7 @@@ msgstr "
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5310,7 -4318,6 +5438,7 @@@ msgstr "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5318,249 -4325,197 +5446,249 @@@ msgstr "
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "�Crear realmente? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "nunca "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Normativa de sinaturas cr�ticas: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Normativa de sinaturas: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notaci�n de sinaturas cr�ticas: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notaci�n de sinaturas: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 sinatura err�nea\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d sinaturas err�neas\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Chaveiro"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "om�tese `%s': %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " Pegada dactilar ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "comprobando o chaveiro `%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: chaveiro creado\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: non � un ID de chave v�lido\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
"non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"asinado coa s�a chave %08lX no %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
@@@ -5594,7 -4543,6 +5722,7 @@@ msgstr "datos cifrados coa chave p�blic
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
@@@ -5640,261 -4579,209 +5768,261 @@@ msgstr "descifrado correcto\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: o remitente pediu \"confidencial\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome do ficheiro orixinal='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Sinatura INCORRECTA de\""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Sinatura caducada de \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "verificaci�n de sinatura suprimida\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "non se poden manexar estas sinaturas m�ltiples\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Chave dispo�ible en: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "A sinatura caduca o %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "modo texto"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "desco�ecido"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave p�blica desco�ecido"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Non foi posible verifica-la sinatura: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "non � unha sinatura separada\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "sinatura independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "Sinatura � vello estilo (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr ""
"a actualizaci�n da base de datos de confianza fallou:\n"
"%s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "algoritmo de cifrado non implementado"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "empregue \"%s%s\" no seu canto\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Sen comprimir"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "Sen comprimir"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "esta mensaxe pode non ser utilizable por %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "lendo as opci�ns de `%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "clase de sinatura desco�ecida"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6088,31 -4942,24 +6216,31 @@@ msgstr "�� esta foto correcta (s/N/q)?
msgid "unable to display photo ID!\n"
msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Non se especificou un motivo"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "A chave � obsoleta"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Esta chave quedou descoberta"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Xa non se emprega esta chave"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "O ID de usuario xa non � v�lido"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "motivo para a revocaci�n: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "comentario de revocaci�n: "
@@@ -6126,100 -4973,81 +6254,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMsSoO"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Non se asignou un valor de confianza a:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alias \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "Esta chave probablemente pertenza ao propietario\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Non sei\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NON conf�o\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Conf�o absolutamente\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = voltar ao men� principal\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " o = omitir esta chave\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " s = sa�r\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "�A s�a decisi�n? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "�Est� seguro de querer dar confianza absoluta a esta chave? "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Esta chave probablemente pertenza ao propietario\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Esta chave pert�ncenos a n�s\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6231,119 -5059,94 +6359,119 @@@ msgstr "
"respostar � seguinte pregunta cun \"si\"\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "�Empregar esta chave de t�dolos xeitos?"
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
#, 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:546
++#: g10/pkclist.c:547
#, 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:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Isto pode significar que a sinatura est� falsificada.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta chave est� desactivada.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Nota: �Esta chave xa caducou!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: �Esta chave NON � de confianza!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Probablemente, a sinatura estea FALSIFICADA.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitido: a chave p�blica est� desactivada\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitido: a chave p�blica xa est� presente\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6351,76 -5154,59 +6479,76 @@@ msgstr "
"\n"
"Introduza o ID de usuario. Remate cunha li�a en branco: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Non hai tal ID de usuario.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "A chave p�blica est� desactivada.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "omitido: chave p�blica xa estabrecida\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "non hai enderezos v�lidos\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "os datos non foron gardados; use a opci�n \"--output\" para gardalos\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Sinatura non adxunta.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Por favor, introduza o nome do ficheiro de datos: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "lendo de stdin ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "non hai datos asinados\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "non foi posible abri-los datos asinados `%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "non foi posible abri-los datos asinados `%s'\n"
@@@ -6459,8 -5238,6 +6587,8 @@@ msgstr "NOTA: a chave secreta %08lX cad
msgid "Note: key has been revoked"
msgstr "NOTA: a chave est� revocada"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "a chamada a build_packet fallou: %s\n"
@@@ -6470,43 -5246,39 +6598,49 @@@
msgid "key %s has no user IDs\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Ha ser revocada por:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Esta � unha chave de revocaci�n sensible)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "A chave secreta est� disponible.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "Forzouse unha sa�da con armadura ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "a chamada a make_keysig_packet fallou: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Creouse o certificado de revocaci�n.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6514,19 -5286,27 +6648,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "non se atopou a chave secreta `%s': %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6544,33 -5324,26 +6691,33 @@@ msgstr "
"se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
"m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Por favor, escolla o motivo da revocaci�n:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Cancelar"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(probablemente queira seleccionar %d aqu�)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Motivo para a revocaci�n: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Non se deu unha descrici�n)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "�� correcto? "
@@@ -6596,38 -5365,31 +6743,38 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = amosar m�is informaci�n\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
"se pode desfacer!\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "a chave p�blica %08lX � %lu segundos m�is nova c� sinatura\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6635,7 -5397,6 +6782,7 @@@ msgstr "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6643,31 -5404,26 +6790,31 @@@ msgstr "
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: a chave est� revocada"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"asumindo unha sinatura incorrecta da chave %08lX debido a un bit cr�tico "
"desco�ecido\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
"subchave\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
@@@ -6708,34 -5458,28 +6855,34 @@@ msgstr "
msgid "signing:"
msgstr "asinando:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "hase empregar cifrado %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"a chave non est� marcada coma insegura - non se pode empregar co xerador de "
"n�meros aleatorios falso\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "om�tese `%s': duplicada\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "om�tese: a chave secreta xa est� presente\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"om�tese `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
"para sinaturas!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@@ -6783,7 -5519,6 +6930,7 @@@ msgstr "erro ao buscar un rexistro de c
msgid "read error in '%s': %s\n"
msgstr "erro de lectura: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
@@@ -6813,7 -5543,6 +6960,7 @@@ msgstr "
msgid "trustdb transaction too large\n"
msgstr "transacci�n da base de datos de confianza demasiado grande\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
@@@ -6930,119 -5636,95 +7077,119 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "`%s' non � un ID longo de chave v�lido\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "chave %08lX: aceptada como chave de confianza\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "a chave %08lX aparece m�is dunha vez na base de datos de confianza\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "chave marcada coma de confianza absoluta.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "rexistro de confianza %lu, tipo da petici�n %d: fallou a lectura: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "non se precisa comproba-la base de datos de confianza\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "hase comproba-la base de datos de confianza o %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "non se precisa comproba-la base de datos de confianza\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "non se precisa comproba-la base de datos de confianza\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "non se atopou a chave p�blica %08lX: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "por favor, execute con --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "comprobando a base de datos de confianza\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "non se atoparon chaves de confianza absoluta\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@@ -7280,11 -5913,9 +7427,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "o env�o ao servidor de chaves fallou: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7425,12 -6028,10 +7572,12 @@@ msgstr "Sinatura %s, algoritmo de resum
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@@ -7452,7 -6050,6 +7599,7 @@@ msgstr "Introduza o ID de usuario:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7512,12 -6097,10 +7659,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7961,7 -6452,6 +8108,7 @@@ msgstr "erro ao crea-lo chaveiro `%s':
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "A xeraci�n da chave fallou: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8560,7 -6930,6 +8707,7 @@@ msgstr "Certificado non v�lido
msgid " runtime cached certificates: %u\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "Creouse o certificado de revocaci�n.\n"
@@@ -8570,8 -6938,6 +8717,8 @@@
msgid "certificate cached\n"
msgstr "Revocaci�n de certificado v�lida"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -8633,7 -6988,6 +8780,7 @@@ msgstr "fallou o borrado do bloque de c
msgid "not removing file '%s'\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -8858,223 -7168,180 +9005,223 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "resposta do axente non v�lida\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "converting S-expression failed: %s\n"
msgstr "o cambio de permisos de `%s' fallou: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "creating S-expression failed: %s\n"
msgstr "o cambio de permisos de `%s' fallou: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "a chamada a build_packet fallou: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "escribindo a `%s'\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "Certificado correcto"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "verificaci�n de sinatura suprimida\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "non se pode crea-lo directorio `%s': %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "non se pode crea-lo directorio `%s': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "lid ?: insert failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "lid ?: a inserci�n fallou: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "escribindo a `%s'\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: erro ao ler un rexistro libre: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
#| msgid "lid ?: insert failed: %s\n"
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "lid ?: a inserci�n fallou: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
@@@ -9120,77 -7377,61 +9267,77 @@@ msgstr "erro ao crear `%s': %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "erro lendo `%s': %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "non se atopou a chave `%s': %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "Creouse o certificado de revocaci�n.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
#| msgid "bad certificate"
msgid "validate a certificate"
msgstr "certificado err�neo"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
#| msgid "bad certificate"
msgid "lookup a certificate"
msgstr "certificado err�neo"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "Certificado non v�lido"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "Certificado correcto"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Introduza o ID de usuario do revocador designado: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9198,226 -7439,155 +9345,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "non se puido conectar a `%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "Revocaci�n de certificado v�lida"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOTA: a chave est� revocada"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "non se puido facer stat sobre `%s': %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "non se puido conectar a `%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmos soportados:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "�Sa�r sin gardar? "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9430,91 -7600,72 +9550,91 @@@ msgstr "
"@\n"
"(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opci�ns] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "li�a longa de m�is\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "erro de lectura: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "non procesado"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9765,12 -7865,10 +9885,12 @@@ msgstr "buscando \"%s\" no servidor HK
msgid "malloc failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9805,11 -7897,10 +9925,12 @@@ msgstr "erro lendo `%s': %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "non se atopou a chave `%s': %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9957,72 -8018,61 +10078,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, 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:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10280,11 -8270,9 +10406,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/gnupg2.pot
index af4796a,09f792b..593e7c9
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@@ -1,27 -1,26 +1,27 @@@
-# Norwegian translation (bokm�l dialect) of GnuPG.
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the GnuPG package.
-# Trond Endrest�l <Trond.Endrestol at fagskolen.gjovik.no>, 2004.
-#
-# Send this file to:
-# translations at gnupg.org
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.9\n"
-"Project-Id-Version: gnupg 1.4.3\n"
++"Project-Id-Version: GNU gnupg 2.1.10\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-10-09 17:17+0200\n"
-"PO-Revision-Date: 2015-02-11 19:18+0100\n"
-"Last-Translator: Trond Endrest�l <Trond.Endrestol at fagskolen.gjovik.no>\n"
-"Language-Team: Norwegian Bokm�l <i18n-nb at lister.ping.uio.no>\n"
-"Language: nb\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#, fuzzy, c-format
+#: agent/call-pinentry.c:257
+#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
-msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+msgstr ""
#. TRANSLATORS: These are labels for buttons etc used in
#. Pinentries. An underscore indicates that the next letter
@@@ -67,9 -61,9 +67,9 @@@ msgstr "
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
-#, fuzzy
++#: agent/call-pinentry.c:724
msgid "Quality:"
-msgstr "gyldighet: %s"
+msgstr ""
#. TRANSLATORS: This string is a tooltip, shown by pinentry when
#. hovering over the quality bar. Please use an appropriate
@@@ -77,105 -71,80 +77,105 @@@
#. 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:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
-#, fuzzy
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
-msgstr "ugyldig passfrase"
+msgstr ""
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
-#, fuzzy
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
-msgstr "for lang linje"
+msgstr ""
- #: agent/call-pinentry.c:988
-#, fuzzy
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
-msgstr "for lang linje"
+msgstr ""
- #: agent/call-pinentry.c:996
-#, fuzzy
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
-msgstr "Ugyldig tegn i navn\n"
+msgstr ""
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
-#, fuzzy
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
-msgstr "ugyldig MPI"
+msgstr ""
- #: agent/call-pinentry.c:1014
-#, fuzzy
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
-msgstr "ugyldig passfrase"
+msgstr ""
+#: agent/command-ssh.c:604 agent/command-ssh.c:699
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
-#, fuzzy, c-format
-#| msgid "can't create `%s': %s\n"
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
+#, c-format
msgid "can't create '%s': %s\n"
-msgstr "kan ikke opprette �%s�: %s\n"
+msgstr ""
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
-#, fuzzy, c-format
-#| msgid "can't open `%s': %s\n"
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
+#, c-format
msgid "can't open '%s': %s\n"
-msgstr "kan ikke �pne �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: agent/command-ssh.c:2437 agent/command-ssh.c:2455
+#, c-format
msgid "error getting serial number of card: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgstr ""
+#: agent/command-ssh.c:2441
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
@@@ -230,23 -190,28 +230,23 @@@ msgid "
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr ""
-"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
-"\n"
-#, fuzzy, c-format
+#: agent/command-ssh.c:3614
+#, c-format
msgid "failed to create stream from socket: %s\n"
-msgstr "klarte ikke � lagre n�kkelen: %s\n"
+msgstr ""
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
-#, fuzzy
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
-"Vennligst fjern det n�v�rende kortet og sett inn kortet med serienummeret:\n"
-" %.*s\n"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
-#, fuzzy
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
-"Vennligst fjern det n�v�rende kortet og sett inn kortet med serienummeret:\n"
-" %.*s\n"
-#, fuzzy
+#: agent/divert-scd.c:204
msgid "Admin PIN"
-msgstr "|A|Admin PIN"
+msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
@@@ -366,42 -318,32 +366,42 @@@ msgid "
"@Options:\n"
" "
msgstr ""
-"@\n"
-"Valg:\n"
-" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
-msgstr "fyldig output"
+msgstr ""
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
-msgstr "v�re noenlunde stille"
+msgstr ""
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
-#, fuzzy
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
-msgstr "leser valg fra �%s�\n"
+msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -476,156 -406,119 +476,155 @@@ 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.
-#, fuzzy
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
-msgstr "Vennligst rapporter feil til <gnupg-bugs at gnu.org>.\n"
+msgstr ""
-#, fuzzy
+#: agent/gpg-agent.c:449
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
-msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+msgstr ""
+#: agent/gpg-agent.c:451
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
+#, c-format
msgid "Note: no default option file '%s'\n"
-msgstr "MERK: ingen standard valgfil �%s�\n"
+msgstr ""
- #: agent/gpg-agent.c:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
+#, c-format
msgid "option file '%s': %s\n"
-msgstr "valgfil �%s�: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
-#, fuzzy, c-format
-#| msgid "reading options from `%s'\n"
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
+#, c-format
msgid "reading options from '%s'\n"
-msgstr "leser valg fra �%s�\n"
+msgstr ""
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr ""
- #: agent/gpg-agent.c:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
+#, c-format
msgid "can't create socket: %s\n"
-msgstr "kan ikke opprette �%s�: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
- #: agent/gpg-agent.c:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
-#, fuzzy
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
+#, c-format
msgid "error binding socket to '%s': %s\n"
-msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
+#, c-format
msgid "listen() failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
+#, c-format
msgid "listening on socket '%s'\n"
-msgstr "skriver hemmelig n�kkel til �%s�\n"
+msgstr ""
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
-#, fuzzy, c-format
-#| msgid "can't create directory `%s': %s\n"
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 sm/keydb.c:97
+#, c-format
msgid "can't create directory '%s': %s\n"
-msgstr "kan ikke opprette katalogen �%s�: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
-#, fuzzy, c-format
-#| msgid "directory `%s' created\n"
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
+#, c-format
msgid "directory '%s' created\n"
-msgstr "katalogen �%s� ble opprettet\n"
+msgstr ""
- #: agent/gpg-agent.c:1852
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1837
+#, c-format
msgid "stat() failed for '%s': %s\n"
-msgstr "fstat(%d) mislyktes in %s: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1856
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1841
+#, c-format
msgid "can't use '%s' as home directory\n"
-msgstr "kan ikke opprette katalogen �%s�: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
+#, c-format
msgid "error reading nonce on fd %d: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
-#, fuzzy, c-format
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
+#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
-msgstr "oppdatering av hemmelig mislyktes: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
-#, fuzzy, c-format
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
+#, c-format
msgid "%s %s stopped\n"
-msgstr "%s: hoppet over: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr ""
@@@ -639,16 -531,13 +638,16 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
msgstr ""
-"@Kommandoer:\n"
-" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -685,51 -572,42 +684,51 @@@ msgid "
"needed to complete this operation."
msgstr ""
-#, fuzzy
+#: agent/protect-tool.c:710 tools/symcryptrun.c:454
msgid "cancelled\n"
-msgstr "cancel|cancel"
+msgstr ""
-#, fuzzy, c-format
+#: agent/protect-tool.c:712 tools/symcryptrun.c:450
+#, c-format
msgid "error while asking for the passphrase: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
-#, fuzzy, c-format
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
+#, c-format
msgid "error opening '%s': %s\n"
-msgstr "feil med �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#, c-format
msgid "file '%s', line %d: %s\n"
-msgstr "valgfil �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: agent/trustlist.c:192 agent/trustlist.c:200
+#, c-format
msgid "statement \"%s\" ignored in '%s', line %d\n"
-msgstr "lesefeil ved �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: agent/trustlist.c:206
+#, c-format
msgid "system trustlist '%s' not available\n"
-msgstr "hemmelig n�kkel er ikke tilgjengelig"
+msgstr ""
-#, fuzzy, c-format
+#: agent/trustlist.c:250
+#, c-format
msgid "bad fingerprint in '%s', line %d\n"
-msgstr "lesefeil ved �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: agent/trustlist.c:275 agent/trustlist.c:282
+#, c-format
msgid "invalid keyflag in '%s', line %d\n"
-msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+msgstr ""
-#, fuzzy, c-format
+#: agent/trustlist.c:316 common/helpfile.c:136
+#, c-format
msgid "error reading '%s', line %d: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
+#: agent/trustlist.c:427 agent/trustlist.c:496
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@@ -843,42 -707,30 +842,42 @@@ msgstr "
msgid "secret key parts are not available\n"
msgstr ""
-#, fuzzy, c-format
+#: agent/cvt-openpgp.c:344
+#, c-format
msgid "public key algorithm %d (%s) is not supported\n"
-msgstr "ikke st�ttet"
+msgstr ""
-#, fuzzy, c-format
+#: agent/cvt-openpgp.c:448
+#, c-format
msgid "protection algorithm %d (%s) is not supported\n"
-msgstr "kryptert med en ukjent algoritme %d\n"
+msgstr ""
-#, fuzzy, c-format
+#: agent/cvt-openpgp.c:455
+#, c-format
msgid "protection hash algorithm %d (%s) is not supported\n"
-msgstr "ikke st�ttet"
+msgstr ""
-#, fuzzy, c-format
+#: common/exechelp-posix.c:324 common/exechelp-w32.c:391
+#: common/exechelp-w32.c:415 common/exechelp-w32.c:445
+#: dirmngr/ldap-wrapper.c:710
+#, c-format
msgid "error creating a pipe: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: common/exechelp-posix.c:337 common/exechelp-w32.c:401
+#: common/exechelp-w32.c:425 common/exechelp-w32.c:455
+#, c-format
msgid "error creating a stream for a pipe: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
+#, c-format
msgid "error forking process: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
+#: common/exechelp-posix.c:539 common/exechelp-w32.c:702
+#: common/exechelp-w32ce.c:751
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
@@@ -1020,7 -843,6 +1019,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1038,7 -859,6 +1037,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1296,46 -1091,38 +1295,46 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
-#, fuzzy
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
-msgstr "ikke tvunget"
+msgstr ""
-#, fuzzy, c-format
+#: common/argparse.c:403
+#, c-format
msgid "invalid option \"%.50s\"\n"
-msgstr "ugyldige listevalg\n"
+msgstr ""
+#: common/logging.c:933
#, c-format
msgid "you found a bug ... (%s:%d)\n"
-msgstr "du fant en feil ... (%s:%d)\n"
+msgstr ""
-#, fuzzy, c-format
+#: common/utf8conv.c:116
+#, c-format
msgid "conversion from '%s' to '%s' not available\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: common/utf8conv.c:124
+#, c-format
msgid "iconv_open failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: common/utf8conv.c:378 common/utf8conv.c:644
+#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: common/dotlock.c:669
+#, c-format
msgid "failed to create temporary file '%s': %s\n"
-msgstr "kan ikke opprette katalogen �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: common/dotlock.c:724
+#, c-format
msgid "error writing to '%s': %s\n"
-msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+msgstr ""
+#: common/dotlock.c:1056
#, c-format
msgid "removing stale lockfile (created by %d)\n"
msgstr ""
@@@ -1467,477 -1228,386 +1466,483 @@@ msgstr "
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
+#: g10/call-agent.c:189
msgid "Enter passphrase: "
-msgstr "Tast inn passfrase: "
+msgstr ""
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
-msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
+msgstr ""
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
-msgstr "OpenPGP-kortnummer %s oppdaget\n"
+msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
-msgstr "kan ikke gj�re dette i batchmodus\n"
+msgstr ""
-#, fuzzy
+#: g10/card-util.c:108
msgid "This command is only available for version 2 cards\n"
-msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
+msgstr ""
+#: g10/card-util.c:110 scd/app-openpgp.c:2256
msgid "Reset Code not or not anymore available\n"
msgstr ""
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
-msgstr "Ditt valg? "
+msgstr ""
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
-msgstr "[ikke satt]"
+msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
-msgstr "mann"
+msgstr ""
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
-msgstr "dame"
+msgstr ""
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
-msgstr "uspesifisert"
+msgstr ""
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
-msgstr "ikke tvunget"
+msgstr ""
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
-msgstr "tvunget"
+msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
+msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
-msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
+msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
-msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
+msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
-msgstr "Kortholders etternavn: "
+msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
-msgstr "Kortholders fornavn: "
+msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr "Feil: Det kombinerte navnet er for langt (grensa g�r ved %d tegn).\n"
+msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
-msgstr "URL for � hente offentlig n�kkel: "
+msgstr ""
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
-msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
+msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
-#, fuzzy, c-format
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
+#, c-format
msgid "error allocating enough memory: %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
+#, c-format
msgid "error reading '%s': %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
-#, fuzzy, c-format
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
+#, c-format
msgid "error writing '%s': %s\n"
-msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
-msgstr "Logindata (kontonavn): "
+msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr "Feil: Logindata er for langt (grensa g�r ved %d tegn).\n"
+msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
-msgstr "Privat DO-data: "
+msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
+msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
-msgstr "Spr�kpreferanser:"
+msgstr ""
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
-msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
+msgstr ""
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
-msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
+msgstr ""
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
+msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
-msgstr "Feil: ugyldig respons.\n"
+msgstr ""
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
-msgstr "CA-fingeravtrykk: "
+msgstr ""
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
-msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+msgstr ""
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
-msgstr "n�kkeloperasjonen er umulig: %s\n"
+msgstr ""
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
-msgstr "ikke et OpenPGP-kort"
+msgstr ""
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+msgstr ""
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
-msgstr "Erstatte eksisterende n�kkel? (j/N) "
+msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
-#, fuzzy, c-format
++#: g10/card-util.c:1302
+#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
-msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+msgstr ""
- #: g10/card-util.c:1298
-#, fuzzy, c-format
++#: g10/card-util.c:1304
+#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
-msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+msgstr ""
- #: g10/card-util.c:1299
-#, fuzzy, c-format
++#: g10/card-util.c:1305
+#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
-msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+msgstr ""
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
-msgstr "rundet opp til %u bits\n"
+msgstr ""
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
-#, fuzzy, c-format
++#: g10/card-util.c:1349
+#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
-msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+msgstr ""
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
+msgstr ""
- #: g10/card-util.c:1381
-#, fuzzy
++#: g10/card-util.c:1387
msgid "Note: keys are already stored on the card!\n"
-msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
+msgstr ""
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
-msgstr "Erstatte eksisterende n�kler? (j/N) "
+msgstr ""
- #: g10/card-util.c:1396
-#, fuzzy, 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"
++#: g10/card-util.c:1402
+#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
" PIN = '%s' Admin PIN = '%s'\n"
"You should change them using the command --change-pin\n"
msgstr ""
-"V�r obs p� at fabrikkinnstilingene for PIN-kodene er\n"
-" PIN = �%s� Admin PIN = �%s�\n"
-"Du b�r endre dem med kommandoen --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
-msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
+msgstr ""
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
-msgstr " (1) Signaturn�kkel\n"
+msgstr ""
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
-msgstr " (2) Krypteringsn�kkel\n"
+msgstr ""
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
-msgstr " (3) Autentiseringsn�kkel\n"
+msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
-msgstr "Ugyldig valg.\n"
+msgstr ""
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
-msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
+msgstr ""
- #: g10/card-util.c:1609
-#, fuzzy, c-format
++#: g10/card-util.c:1615
+#, c-format
msgid "KEYTOCARD failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
- #: g10/card-util.c:1705
-#, fuzzy
-#| msgid "This command is not allowed while in %s mode.\n"
++#: g10/card-util.c:1711
msgid "This command is not supported by this card\n"
-msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
+msgstr ""
- #: g10/card-util.c:1710
-#, fuzzy
++#: g10/card-util.c:1716
msgid "Note: This command destroys all keys stored on the card!\n"
-msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
+msgstr ""
- #: g10/card-util.c:1713
-#, fuzzy
-#| msgid "Sign it? (y/N) "
++#: g10/card-util.c:1719
msgid "Continue? (y/N) "
-msgstr "Signere den? (j/N) "
+msgstr ""
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
-msgstr "avslutte denne menyen"
+msgstr ""
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
-msgstr "vise admin-kommandoer"
+msgstr ""
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
-msgstr "vise denne hjelpen"
+msgstr ""
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
-msgstr "vis alle tilgjengelige data"
+msgstr ""
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
-msgstr "endre kortholders navn"
+msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
-msgstr "endre URL for � hente n�kkel"
+msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
-msgstr "hente n�kkelen angitt i URL som er lagret i kortet"
+msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
-msgstr "endre loginnavnet"
+msgstr ""
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
-msgstr "endre spr�kpreferansene"
+msgstr ""
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
-msgstr "endre kortholders kj�nn"
+msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
-msgstr "vise et CA-fingeravtrykk"
+msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
-msgstr "veksle tving-signatur-PIN-flagget"
+msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
-msgstr "generere nye n�kler"
+msgstr ""
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
-msgstr "meny for � endre eller fjerne blokkering av PIN"
+msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
-msgstr "bekrefte PIN og vise alle data"
+msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
-msgstr "Admin-reservert kommando\n"
+msgstr ""
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
-msgstr "Admin-kommandoer er tillatt\n"
+msgstr ""
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
-msgstr "Admin-kommandoer er ikke tillatt\n"
+msgstr ""
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
-msgstr "Ugyldig kommando (pr�v �help�)\n"
+msgstr ""
+#: g10/decrypt.c:192 g10/encrypt.c:939
msgid "--output doesn't work for this command\n"
-msgstr "--output virker ikke for denne kommandoen\n"
+msgstr ""
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
-#, fuzzy, c-format
-#| msgid "can't open `%s'\n"
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
+#, c-format
msgid "can't open '%s'\n"
-msgstr "kan ikke �pne �%s�\n"
+msgstr ""
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
-msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
+msgstr ""
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
-msgstr "feil ved lesing av n�kkelblokk: %s\n"
+msgstr ""
- #: g10/delkey.c:128 g10/delkey.c:135
-#, fuzzy, c-format
-#| msgid "key \"%s\" not found: %s\n"
++#: g10/delkey.c:119 g10/gpg.c:2215
++#, c-format
+ msgid "key \"%s\" not found\n"
-msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
++msgstr ""
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(med mindre du angir n�kkelen ved hjelp av fingeravtrykk)\n"
+msgstr ""
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "kan ikke gj�re dette i batchmode uten �--yes�\n"
+msgstr ""
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
-msgstr "Slette denne n�kkelen fra n�kkelknippet? (j/N)"
+msgstr ""
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
-msgstr "Dette er en hemmelig n�kkel! - virkelig slette den? (j/N)"
+msgstr ""
- #: g10/delkey.c:194
-#, fuzzy, c-format
++#: g10/delkey.c:196
+#, c-format
msgid "deleting secret %s failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: g10/delkey.c:196
-#, fuzzy
-#| msgid "bad key"
++#: g10/delkey.c:198
msgid "key"
-msgstr "ugyldig n�kkel"
+msgstr ""
- #: g10/delkey.c:196
-#, fuzzy
-#| msgid "Pubkey: "
++#: g10/delkey.c:198
msgid "subkey"
-msgstr "Offentlig n�kkel: "
+msgstr ""
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
-msgstr "nullstilt informasjon om eiertillit\n"
+msgstr ""
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "det finnes en hemmelig n�kkel for offentlig n�kkel �%s�!\n"
+msgstr ""
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "bruk valget �--delete-secret-keys� for � slette den f�rst.\n"
+msgstr ""
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
+#: g10/encrypt.c:233
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "kan ikke bruke en symmetrisk ESK-pakke p� grunn av S2K-modusen\n"
+msgstr ""
+#: g10/encrypt.c:247
#, c-format
msgid "using cipher %s\n"
-msgstr "bruker cipher %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "`%s' already compressed\n"
+#: g10/encrypt.c:257 g10/encrypt.c:617
+#, c-format
msgid "'%s' already compressed\n"
-msgstr "�%s� er allerede komprimert\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "WARNING: `%s' is an empty file\n"
+#: g10/encrypt.c:314 g10/encrypt.c:653 g10/sign.c:580
+#, c-format
msgid "WARNING: '%s' is an empty file\n"
-msgstr "ADVARSEL: �%s� er en tom fil\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
+#: g10/encrypt.c:550
+#, c-format
msgid "reading from '%s'\n"
-msgstr "leser fra �%s�\n"
+msgstr ""
+#: g10/encrypt.c:598
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -1954,28 -1626,24 +1959,28 @@@ msgstr "
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
-"p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
-msgstr "du kan ikke bruke %s i %s modus\n"
+msgstr ""
+#: g10/encrypt.c:909
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s kryptert for: \"%s\"\n"
+msgstr ""
+#: g10/decrypt-data.c:94 g10/mainproc.c:307
#, c-format
msgid "%s encrypted data\n"
-msgstr "%s krypterte data\n"
+msgstr ""
+#: g10/decrypt-data.c:97 g10/mainproc.c:311
#, c-format
msgid "encrypted with unknown algorithm %d\n"
-msgstr "kryptert med en ukjent algoritme %d\n"
+msgstr ""
+#: g10/decrypt-data.c:165 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
@@@ -1992,310 -1659,281 +1997,329 @@@ msgstr "
msgid ""
"external program calls are disabled due to unsafe options file permissions\n"
msgstr ""
-"eksterne programkall er utkoblet p� grunn av utrygge rettigheter p� "
-"konfigurasjonsfila\n"
+#: g10/exec.c:349
msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
-"denne plattformen krever midlertidige filer ved kall p� eksterne programmer\n"
-#, fuzzy, c-format
-#| msgid "unable to execute program `%s': %s\n"
+#: g10/exec.c:427
+#, c-format
msgid "unable to execute program '%s': %s\n"
-msgstr "kunne ikke utf�re program �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "unable to execute shell `%s': %s\n"
+#: g10/exec.c:430
+#, c-format
msgid "unable to execute shell '%s': %s\n"
-msgstr "kunne ikke utf�re skallet �%s�: %s\n"
+msgstr ""
+#: g10/exec.c:521
#, c-format
msgid "system error while calling external program: %s\n"
-msgstr "systemfeil under kall p� eksternt program: %s\n"
+msgstr ""
+#: g10/exec.c:532 g10/exec.c:599
msgid "unnatural exit of external program\n"
-msgstr "unaturlig avslutning av eksternt program\n"
+msgstr ""
+#: g10/exec.c:547
msgid "unable to execute external program\n"
-msgstr "klarte ikke � kj�re eksternt program\n"
+msgstr ""
+#: g10/exec.c:564
#, c-format
msgid "unable to read external program response: %s\n"
-msgstr "klarte ikke � lese reponsen fra eksternt program: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+#: g10/exec.c:610 g10/exec.c:617
+#, c-format
msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
-msgstr "ADVARSEL: klarte ikke � fjerne midlertidig fil (%s) �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "WARNING: unable to remove temp directory `%s': %s\n"
+#: g10/exec.c:622
+#, c-format
msgid "WARNING: unable to remove temp directory '%s': %s\n"
-msgstr "ADVARSEL: klarte ikke � fjerne midlertidig katalog �%s�: %s\n"
+msgstr ""
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
-msgstr "eksportere signaturer som er markert som bare-lokale"
+msgstr ""
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr ""
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
-msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
+msgstr ""
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "n�kkel %s: PGP 2.x-aktig n�kkel - hoppet over\n"
+msgstr ""
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
-msgstr "n�kkel %s: n�kkelmateriell p� kort - hoppet over\n"
+msgstr ""
- #: g10/export.c:1179
-#, fuzzy
-#| msgid "%s: skipped: %s\n"
++#: g10/export.c:1275
msgid " - skipped"
-msgstr "%s: hoppet over: %s\n"
+msgstr ""
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
-msgstr "ADVARSEL: ingenting eksportert\n"
+msgstr ""
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
-msgstr "[Brukerid ikke funnet]"
+msgstr ""
- #: g10/getkey.c:1012
-#, fuzzy, c-format
++#: g10/getkey.c:1034
+#, c-format
msgid "automatically retrieved '%s' via %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/getkey.c:1018
-#, fuzzy, c-format
++#: g10/getkey.c:1040
+#, c-format
msgid "error retrieving '%s' via %s: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/getkey.c:1020
-#, fuzzy
++#: g10/getkey.c:1042
msgid "No fingerprint"
-msgstr "CA-fingeravtrykk: "
+msgstr ""
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
-msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
++msgstr ""
+
-#, fuzzy, c-format
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
++#, c-format
+ msgid "(check argument of option '%s')\n"
-msgstr "ugyldige listevalg\n"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "unusable secret key"
++#: g10/getkey.c:1216
++#, c-format
+ msgid "using \"%s\" as default secret key\n"
-msgstr "ubrukelig hemmelig n�kkel"
++msgstr ""
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
+msgstr ""
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
-msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
+msgstr ""
- #: g10/gpg.c:397 sm/gpgsm.c:195
-#, fuzzy
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
-msgstr "|[fil]|lage en signatur"
+msgstr ""
- #: g10/gpg.c:398
-#, fuzzy
++#: g10/gpg.c:406
msgid "make a clear text signature"
-msgstr "|[fil]|lage en klartekstsignatur"
+msgstr ""
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
-msgstr "lage en adskilt signatur"
+msgstr ""
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
-msgstr "kryptere data"
+msgstr ""
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
-msgstr "kryptering med bare symmetrisk cipher"
+msgstr ""
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
-msgstr "dekryptere data (standard)"
+msgstr ""
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
-msgstr "bekrefte en signatur"
+msgstr ""
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
-msgstr "liste n�kler"
+msgstr ""
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
-msgstr "liste n�kler og signaturer"
+msgstr ""
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
-msgstr "vise og sjekke n�kkelsignaturer"
+msgstr ""
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
-msgstr "liste n�kler og fingeravtrykk"
+msgstr ""
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
-msgstr "liste hemmelige n�kler"
+msgstr ""
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
-msgstr "generere et nytt n�kkelpar"
+msgstr ""
- #: g10/gpg.c:417
-#, fuzzy
-#| msgid "generate a new key pair"
++#: g10/gpg.c:425
msgid "quickly generate a new key pair"
-msgstr "generere et nytt n�kkelpar"
+msgstr ""
- #: g10/gpg.c:419
-#, fuzzy
-#| msgid "generate a new key pair"
++#: g10/gpg.c:427
msgid "quickly add a new user-id"
-msgstr "generere et nytt n�kkelpar"
+msgstr ""
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
-msgstr "generere et opphevingssertifikat"
+msgstr ""
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
-msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
+msgstr ""
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
-msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
+msgstr ""
- #: g10/gpg.c:428
-#, fuzzy
-#| msgid "sign a key"
++#: g10/gpg.c:436
msgid "quickly sign a key"
-msgstr "signere en n�kkel"
+msgstr ""
- #: g10/gpg.c:430
-#, fuzzy
-#| msgid "sign a key locally"
++#: g10/gpg.c:438
msgid "quickly sign a key locally"
-msgstr "signere en n�kkel lokalt"
+msgstr ""
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
-msgstr "signere en n�kkel"
+msgstr ""
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
-msgstr "signere en n�kkel lokalt"
+msgstr ""
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
-msgstr "signere eller redigere en n�kkel"
+msgstr ""
- #: g10/gpg.c:435 sm/gpgsm.c:228
-#, fuzzy
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
-msgstr "endre passfrasen"
+msgstr ""
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
-msgstr "eksportere n�kler"
+msgstr ""
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
-msgstr "eksportere n�kler til en n�kkelserver"
+msgstr ""
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
-msgstr "importere n�kler fra en n�kkelserver"
+msgstr ""
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
-msgstr "s�ke etter n�kler p� en n�kkelserver"
+msgstr ""
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
-msgstr "oppdatere alle n�klene fra en n�kkelserver"
+msgstr ""
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
-msgstr "importere/flette n�kler"
+msgstr ""
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
-msgstr "vis kortets status"
+msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
-msgstr "endre data p� et kort"
+msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
-msgstr "endre PIN p� et kort"
+msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
-msgstr "oppdatere tillitsdatabasen"
+msgstr ""
- #: g10/gpg.c:474
-#, fuzzy
++#: g10/gpg.c:482
msgid "print message digests"
-msgstr "|algo [filer]|skrive meldingsdigester"
+msgstr ""
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
-msgstr "lage ASCII-beskyttet output"
+msgstr ""
- #: g10/gpg.c:484 sm/gpgsm.c:254
-#, fuzzy
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|NAVN|kryptere for NAVN"
+msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:290
-#, fuzzy
++#: g10/gpg.c:508 sm/gpgsm.c:290
msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "bruke denne brukeriden for signering eller dekryptering"
+msgstr ""
- #: g10/gpg.c:502
-#, fuzzy
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
+msgstr ""
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
-msgstr "bruk kanonisk tekstmodus"
+msgstr ""
- #: g10/gpg.c:525 sm/gpgsm.c:292
-#, fuzzy
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
-msgstr "leser valg fra �%s�\n"
+msgstr ""
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
-msgstr "ikke gj�r noen endringer"
+msgstr ""
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
-msgstr "sp�r f�r overskriving"
+msgstr ""
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
-msgstr "bruk streng OpenPGP-oppf�rsel"
+msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-"@\n"
-"(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2306,579 -1944,568 +2330,642 @@@
" --list-keys [names] show keys\n"
" --fingerprint [names] show fingerprints\n"
msgstr ""
-"@\n"
-"Eksempler:\n"
-"\n"
-" -se -r Bob [fil] signere og kryptere for brukeren Bob\n"
-" --clearsign [fil] lage en klartekstsignatur\n"
-" --detach-sign [fil] lage en adskilt signatur\n"
-" --list-keys [navn] vise n�kler\n"
-" --fingerprint [navn] vise fingeravtrykk\n"
- #: g10/gpg.c:967
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
++#: g10/gpg.c:983
msgid "Usage: @GPG@ [options] [files] (-h for help)"
-msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+msgstr ""
- #: g10/gpg.c:970
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
++#: g10/gpg.c:986
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
"Default operation depends on the input data\n"
msgstr ""
-"Bruksm�te: gpg [valg] [filer]\n"
-"signere, sjekke, kryptere eller dekryptere\n"
-"standard operasjon avhenger av inputdata\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
msgstr ""
-"\n"
-"St�ttede algoritmer:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
-msgstr "Offentlig n�kkel: "
+msgstr ""
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
-msgstr "Cipher: "
+msgstr ""
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
-msgstr "Hash: "
+msgstr ""
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
-msgstr "Kompresjon: "
+msgstr ""
- #: g10/gpg.c:1074 sm/gpgsm.c:654
-#, fuzzy, c-format
++#: g10/gpg.c:1090 sm/gpgsm.c:654
+#, c-format
msgid "usage: %s [options] %s\n"
-msgstr "bruksm�te: gpg [valg] "
+msgstr ""
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
-msgstr "motstridende kommandoer\n"
+msgstr ""
- #: g10/gpg.c:1292
-#, fuzzy, c-format
-#| msgid "no = sign found in group definition `%s'\n"
++#: g10/gpg.c:1308
+#, c-format
msgid "no = sign found in group definition '%s'\n"
-msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1489
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
++#: g10/gpg.c:1505
+#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
-msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1492
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
++#: g10/gpg.c:1508
+#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
-msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1495
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe ownership on extension `%s'\n"
++#: g10/gpg.c:1511
+#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
-msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1501
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
++#: g10/gpg.c:1517
+#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
-msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1504
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
++#: g10/gpg.c:1520
+#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
-msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1507
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe permissions on extension `%s'\n"
++#: g10/gpg.c:1523
+#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
-msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1513
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
++#: g10/gpg.c:1529
+#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
-"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen "
-"�%s�\n"
- #: g10/gpg.c:1516
-#, fuzzy, c-format
-#| msgid ""
-#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
++#: g10/gpg.c:1532
+#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
-"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
-"�%s�\n"
- #: g10/gpg.c:1519
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
++#: g10/gpg.c:1535
+#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
-"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
- #: g10/gpg.c:1525
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
++#: g10/gpg.c:1541
+#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
-"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
-"�%s�\n"
- #: g10/gpg.c:1528
-#, fuzzy, c-format
-#| msgid ""
-#| "WARNING: unsafe enclosing directory permissions on configuration file `"
-#| "%s'\n"
++#: g10/gpg.c:1544
+#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr ""
-"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
-"konfigurasjonsfilen �%s�\n"
- #: g10/gpg.c:1531
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
++#: g10/gpg.c:1547
+#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
-"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
- #: g10/gpg.c:1738
-#, fuzzy, c-format
-#| msgid "unknown configuration item `%s'\n"
++#: g10/gpg.c:1754
+#, c-format
msgid "unknown configuration item '%s'\n"
-msgstr "ukjent konfigurasjonspunkt �%s�\n"
+msgstr ""
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
-#, fuzzy
-#| msgid "show the keyring name in key listings"
++#: g10/gpg.c:1863
msgid "show key usage information during key listings"
-msgstr "vise navnet til n�kkelknippene i n�kkellister"
+msgstr ""
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr ""
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
-msgstr "vise navnet til n�kkelknippene i n�kkellister"
+msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr ""
- #: g10/gpg.c:2006
-#, fuzzy
++#: g10/gpg.c:1987
+ msgid "available TOFU policies:\n"
-msgstr "utkoble en n�kkel"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "unknown option `%s'\n"
++#: g10/gpg.c:1998
++#, c-format
+ msgid "unknown TOFU policy '%s'\n"
-msgstr "ukjent valg �%s�\n"
++msgstr ""
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
-#, fuzzy, c-format
++#: g10/gpg.c:2022
++#, c-format
+ msgid "unknown TOFU DB format '%s'\n"
-msgstr "ukjent valg �%s�\n"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
++#: g10/gpg.c:2085
+#, c-format
msgid "Note: old default options file '%s' ignored\n"
-msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
+msgstr ""
- #: g10/gpg.c:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
++#: g10/gpg.c:2330 g10/revoke.c:682
++#, c-format
+ msgid "error searching the keyring: %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
++msgstr ""
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
-#, fuzzy, c-format
-#| msgid "NOTE: %s is not for normal use!\n"
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
+#, c-format
msgid "Note: %s is not for normal use!\n"
-msgstr "MERK: %s er ikke for vanlig bruk!\n"
+msgstr ""
- #: g10/gpg.c:2729 g10/gpg.c:2741
-# Tenk litt p� denne du, Trond.
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid signature expiration\n"
++#: g10/gpg.c:3085 g10/gpg.c:3097
+#, c-format
msgid "'%s' is not a valid signature expiration\n"
-msgstr "�%s� er ikke en gyldig signaturutg�else\n"
+msgstr ""
- #: g10/gpg.c:2779
-#, fuzzy, c-format
++#: g10/gpg.c:3138
+#, c-format
msgid "invalid pinentry mode '%s'\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
- #: g10/gpg.c:2832
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid character set\n"
++#: g10/gpg.c:3191
+#, c-format
msgid "'%s' is not a valid character set\n"
-msgstr "�%s� er ikke et gyldig tegnsett\n"
+msgstr ""
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
-msgstr "kunne ikke parse n�kkelserverens URL\n"
+msgstr ""
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
+msgstr ""
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
-msgstr "ugyldige valg for n�kkelserver\n"
+msgstr ""
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: ugyldige importvalg\n"
+msgstr ""
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
-msgstr "ugyldige importvalg\n"
+msgstr ""
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: ugyldige eksportvalg\n"
+msgstr ""
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
-msgstr "ugyldige eksportvalg\n"
+msgstr ""
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: ugyldige listevalg\n"
+msgstr ""
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
-msgstr "ugyldige listevalg\n"
+msgstr ""
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr ""
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr ""
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr ""
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: ugyldige valg for bekreftelse\n"
+msgstr ""
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
-msgstr "ugyldige valg for bekreftelse\n"
+msgstr ""
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
-msgstr "kunne ikke sette exec-path til %s\n"
+msgstr ""
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
+msgstr ""
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
-msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
+msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
-msgstr "ADVARSEL: %s overstyrere %s\n"
+msgstr ""
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr "%s er ikke tillatt sammen med %s!\n"
+msgstr ""
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr "%s er ikke fornuftig med %s!\n"
+msgstr ""
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr ""
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
-msgstr "valgt krypteringsalgoritme er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
-msgstr "valg digestalgoritme er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
-msgstr "valgt kompresjonsalgoritme er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
-msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed m� v�re st�rre enn 0\n"
+msgstr ""
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-neede m� v�re st�rre enn 1\n"
+msgstr ""
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
+msgstr ""
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
+msgstr ""
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
+msgstr ""
- #: g10/gpg.c:3389
-#, fuzzy
-#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
-msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
+msgstr ""
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
+msgstr ""
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
-msgstr "ugyldig standard preferanser\n"
+msgstr ""
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
-msgstr "ugyldig personlig cipherpreferanser\n"
+msgstr ""
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
-msgstr "ugyldig personlig digestpreferanser\n"
+msgstr ""
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
-msgstr "ugyldig personlig kompresjonspreferanser\n"
+msgstr ""
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
-msgstr "%s virker ikke enn� med %s\n"
+msgstr ""
- #: g10/gpg.c:3492
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
++#: g10/gpg.c:3863
+#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
+msgstr ""
- #: g10/gpg.c:3497
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
++#: g10/gpg.c:3868
+#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
-msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
+msgstr ""
- #: g10/gpg.c:3502
-#, fuzzy, c-format
-#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
++#: g10/gpg.c:3873
+#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
-msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
+msgstr ""
- #: g10/gpg.c:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
-msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
+msgstr ""
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-"ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
- #: g10/gpg.c:3662
-#, fuzzy, c-format
++#: g10/gpg.c:4047
++#, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
++msgstr ""
+
-#, fuzzy, c-format
++#: g10/gpg.c:4050
++#, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
++msgstr ""
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
-msgstr "--store [filnavn]"
+msgstr ""
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
-msgstr "--symmetric [filnavn]"
+msgstr ""
- #: g10/gpg.c:3676
-#, fuzzy, c-format
-#| msgid "symmetric encryption of `%s' failed: %s\n"
++#: g10/gpg.c:4078
+#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
-msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
-msgstr "--encrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
-msgstr "--symmetric --encrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
+msgstr ""
- #: g10/gpg.c:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
-msgstr "--sign [filnavn]"
+msgstr ""
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
-msgstr "--sign --encrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--symmetric --sign --encrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
+msgstr ""
- #: g10/gpg.c:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
-msgstr "--sign --symmetric [filnavn]"
+msgstr ""
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
-msgstr "--clearsign [filnavn]"
+msgstr ""
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
-msgstr "--decrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
-msgstr "--sign-key brukerid"
+msgstr ""
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
-msgstr "--lsign-key brukerid"
+msgstr ""
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
-msgstr "--edit-key brukerid [kommandoer]"
+msgstr ""
- #: g10/gpg.c:3903
-#, fuzzy
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
-msgstr "--sign-key brukerid"
+msgstr ""
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
-msgstr "sending til n�kkelserver mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
-msgstr "mottak fra n�kkelserver mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
-msgstr "n�kkeleksport mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
-msgstr "s�k p� n�kkelserver mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
-msgstr "refresh p� n�kkelserver mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
-msgstr "dearmoring failed: %s\n"
+msgstr ""
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
-msgstr "enarmoring failed: %s\n"
+msgstr ""
- #: g10/gpg.c:4234
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
++#: g10/gpg.c:4651
+#, c-format
msgid "invalid hash algorithm '%s'\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
- #: g10/gpg.c:4358
-#, fuzzy, c-format
++#: g10/gpg.c:4795
++#, c-format
+ msgid "error parsing key specification '%s': %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
++msgstr ""
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
-msgstr "[filnavn]"
+msgstr ""
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
-msgstr "Sett i gang og tast inn meldingen din ...\n"
+msgstr ""
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
-msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
-msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
-msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
+msgstr ""
- #: g10/gpgv.c:74
-#, fuzzy
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
-msgstr "hent n�klene fra dette n�kkelknippet"
+msgstr ""
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
-msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
+msgstr ""
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
-msgstr "|FD|skrive statusinfo til denne FD"
+msgstr ""
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
-msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
+msgstr ""
- #: g10/gpgv.c:119
-#, fuzzy
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3046,755 -2644,641 +3133,780 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
-msgstr "n�kkel %s: ingen brukerid\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
+#: g10/import.c:990
+#, c-format
msgid "key %s: %s\n"
-msgstr "hoppet over �%s�: %s\n"
+msgstr ""
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
+#: g10/import.c:1021
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
+msgstr ""
+#: g10/import.c:1037
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "n�kkel %s: akseptert ikke-selvsignert brukerid �%s�\n"
+msgstr ""
+#: g10/import.c:1047
#, c-format
msgid "key %s: no valid user IDs\n"
-msgstr "n�kkel %s: ingen gyldig brukerid\n"
+msgstr ""
+#: g10/import.c:1049
msgid "this may be caused by a missing self-signature\n"
-msgstr "dette kan skyldes en manglende selvsignatur\n"
+msgstr ""
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
-msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
+msgstr ""
+#: g10/import.c:1068
#, c-format
msgid "key %s: new key - skipped\n"
-msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
+msgstr ""
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
-msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
+msgstr ""
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
-#, fuzzy, c-format
-#| msgid "writing to `%s'\n"
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
+#, c-format
msgid "writing to '%s'\n"
-msgstr "skriver til �%s�\n"
+msgstr ""
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
-#, fuzzy, c-format
-#| msgid "error writing keyring `%s': %s\n"
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
+#, c-format
msgid "error writing keyring '%s': %s\n"
-msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
-msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
+msgstr ""
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
-msgstr "n�kkel %s: stemmer ikke med v�r kopi\n"
+msgstr ""
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "n�kkel %s: kan ikke finne original n�kkelblokk: %s\n"
+msgstr ""
- #: g10/import.c:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
-msgstr "n�kkel %s: kan ikke lese original n�kkelblokk: %s\n"
+msgstr ""
- #: g10/import.c:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
+msgstr ""
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "n�kkel %s: �%s� %d nye brukerider\n"
+msgstr ""
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "n�kkel %s: �%s� 1 ny signatur\n"
+msgstr ""
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr ""
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
+msgstr ""
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
+msgstr ""
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr ""
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr ""
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "n�kkel %s: �%s� %d nye brukerider\n"
+msgstr ""
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "n�kkel %s: �%s� %d nye brukerider\n"
+msgstr ""
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
-msgstr "n�kkel %s: �%s� ikke endret\n"
+msgstr ""
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
-msgstr "n�kkel %s: hemmelig n�kkel importert\n"
+msgstr ""
- #: g10/import.c:1555
-#, fuzzy, c-format
-#| msgid "key %s: secret key imported\n"
++#: g10/import.c:1568
+#, c-format
msgid "key %s: secret key already exists\n"
-msgstr "n�kkel %s: hemmelig n�kkel importert\n"
+msgstr ""
- #: g10/import.c:1562
-#, fuzzy, c-format
++#: g10/import.c:1575
+#, c-format
msgid "key %s: error sending to agent: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/import.c:1663
-#, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
++#: g10/import.c:1680
+#, c-format
msgid "secret key %s: %s\n"
-msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+msgstr ""
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
-msgstr "import av hemmelig n�kkel er ikke tillatt\n"
+msgstr ""
- #: g10/import.c:1707
++#: g10/import.c:1724
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
+msgstr ""
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
-"n�kkel %s: ingen offentlig n�kkel - kan ikke anvende opphevingssertifikat\n"
- #: g10/import.c:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+msgstr ""
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
+msgstr ""
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
-msgstr "n�kkel %s: ingen brukerid for signatur\n"
+msgstr ""
- #: g10/import.c:1977
++#: g10/import.c:2019
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme for brukerid �%s�\n"
+msgstr ""
- #: g10/import.c:1979
++#: g10/import.c:2021
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "n�kkel %s: ugyldig selvsignatur for brukerid �%s�\n"
+msgstr ""
- #: g10/import.c:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
-msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
+msgstr ""
- #: g10/import.c:1997
-#, fuzzy, c-format
++#: g10/import.c:2039
+#, c-format
msgid "key %s: invalid direct key signature\n"
-msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
+msgstr ""
- #: g10/import.c:2011
++#: g10/import.c:2053
#, c-format
msgid "key %s: no subkey for key binding\n"
-msgstr "n�kkel %s: ingen undern�kkel for n�kkelbinding\n"
+msgstr ""
- #: g10/import.c:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
-msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
+msgstr ""
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
-msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
+msgstr ""
- #: g10/import.c:2062
++#: g10/import.c:2104
#, c-format
msgid "key %s: no subkey for key revocation\n"
-msgstr "n�kkel %s: ingen undern�kkel for n�kkeloppheving\n"
+msgstr ""
- #: g10/import.c:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
-msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
+msgstr ""
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
-msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
+msgstr ""
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
+msgstr ""
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
-msgstr "n�kkel %s: hoppet over undern�kkel\n"
+msgstr ""
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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"
+msgstr ""
- #: g10/import.c:2198
++#: g10/import.c:2240
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "n�kkel %s: opphevingssertifikat p� feil plass - hoppet over\n"
+msgstr ""
- #: g10/import.c:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
+msgstr ""
- #: g10/import.c:2230
++#: g10/import.c:2272
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "n�kkel %s: undern�kkelsignatur p� feil plass - hoppet over\n"
+msgstr ""
- #: g10/import.c:2238
++#: g10/import.c:2280
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "n�kkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
+msgstr ""
- #: g10/import.c:2367
++#: g10/import.c:2409
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
+msgstr ""
- #: g10/import.c:2431
++#: g10/import.c:2473
#, 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"
+msgstr ""
- #: g10/import.c:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
+msgstr ""
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
-msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
+msgstr ""
-#, fuzzy, c-format
+#: g10/keydb.c:365 g10/keydb.c:392 sm/keydb.c:210
+#, c-format
msgid "error creating keybox '%s': %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
+#: g10/keydb.c:368 g10/keydb.c:395
+#, c-format
msgid "error creating keyring '%s': %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: g10/keydb.c:404 sm/keydb.c:217
+#, c-format
msgid "keybox '%s' created\n"
-msgstr "n�kkelknippet �%s� ble opprettet\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "keyring `%s' created\n"
+#: g10/keydb.c:406
+#, c-format
msgid "keyring '%s' created\n"
-msgstr "n�kkelknippet �%s� ble opprettet\n"
+msgstr ""
- #: g10/keydb.c:678
-#, fuzzy, c-format
-#| msgid "keyblock resource `%s': %s\n"
++#: g10/keydb.c:740
+#, c-format
msgid "keyblock resource '%s': %s\n"
-msgstr "n�kkelblokkressurs �%s�: %s\n"
+msgstr ""
- #: g10/keydb.c:1516
-#, fuzzy, c-format
++#: g10/keydb.c:825
++#, c-format
+ msgid "error opening key DB: %s\n"
-msgstr "feil med �%s�: %s\n"
++msgstr ""
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr ""
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
-msgstr "[oppheving]"
+msgstr ""
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
-msgstr "[selvsignatur]"
+msgstr ""
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
-msgstr "1 ubrukelig signatur\n"
+msgstr ""
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
-msgstr "%d ubrukelige signaturer\n"
+msgstr ""
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
-msgstr "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
+msgstr ""
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
-msgstr "%d signaturer ble ikke sjekket p� grunn av manglende n�kler\n"
+msgstr ""
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
-msgstr "1 signatur ble ikke sjekket p� grunn av en feil\n"
+msgstr ""
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
-msgstr "%d signaturer ble ikke sjekket p� grunn av feil\n"
+msgstr ""
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
-msgstr "1 brukerid uten gyldig selvsignatur ble oppdaget\n"
+msgstr ""
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
+msgstr ""
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
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 ""
-"Vennligst bestem hvor mye du tiltror denne brukeren korrekt � bekrefte\n"
-"andre brukeres n�kler (ved � se p� pass, sjekke fingeravtrykk fra\n"
-"forskjellige kilder, osv.)\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
-msgstr " %d = Jeg stoler marginalt\n"
+msgstr ""
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
-msgstr " %d = Jeg stoler fullt\n"
+msgstr ""
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
-msgstr "Brukerid �%s� er opphevet."
+msgstr ""
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "Er du fortsatt sikker p� at du vil signerere den? (j/N) "
+msgstr ""
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
-msgstr " Kunne ikke signere.\n"
+msgstr ""
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
-msgstr "Brukerid �%s� er utg�tt."
+msgstr ""
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
-msgstr "Brukeriden �%s� er ikke selvsignert."
+msgstr ""
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
-msgstr "Brukeriden �%s� er signerbar."
+msgstr ""
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
-msgstr "Signere den? (j/N) "
+msgstr ""
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
"is a PGP 2.x-style signature.\n"
msgstr ""
-"Selvsignaturen p� �%s�\n"
-"er en PGP 2.x-aktig signatur.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
+msgstr ""
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr ""
-"Din n�v�rende signatur p� �%s�\n"
-"er utg�tt.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "Vil du utstede en ny signatur for � erstatte den som er utg�tt? (j/N) "
+msgstr ""
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr ""
-"Din n�v�rede signatur p� �%s�\n"
-"er en lokal signatur.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
+msgstr ""
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "�%s� var allerede lokalt signert av n�kkelen %s\n"
+msgstr ""
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
-msgstr "�%s� var allerede signert av n�kkelen %s\n"
+msgstr ""
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "Vil du likevel signere den igjen? (j/N) "
+msgstr ""
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
-msgstr "Ingenting � signere med n�kkelen %s\n"
+msgstr ""
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
-msgstr "Denne n�kkelen er utg�tt!"
+msgstr ""
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
-msgstr "Denne n�kkelen utg�r den %s.\n"
+msgstr ""
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "Vil du at signaturen skal utg� p� samme tidspunkt? (J/n) "
+msgstr ""
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
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 ""
-"Hvor n�yaktig har du bekreftet at n�kkelen du skal signere faktisk\n"
-"tilh�rer den overnevnte personen? Tast inn �0� dersom du ikke vet\n"
-"svaret.\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
-msgstr " (0) Jeg vil ikke svare.%s\n"
+msgstr ""
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
-msgstr " (1) Jeg har ikke sjekket i det hele tatt.%s\n"
+msgstr ""
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
-msgstr " (2) Jeg har gjort en vanlig sjekk.%s\n"
+msgstr ""
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
-msgstr " (3) Jeg har sjekket veldig n�ye.%s\n"
+msgstr ""
- #: g10/keyedit.c:936
-#, fuzzy
-#| msgid "Your selection? (enter `?' for more information): "
++#: g10/keyedit.c:947
msgid "Your selection? (enter '?' for more information): "
-msgstr "Ditt valg? (angi �?� for mer informasjon): "
+msgstr ""
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
"key \"%s\" (%s)\n"
msgstr ""
-"Er du virkelig sikker p� at du vil signerere denne n�kkelen med din\n"
-"n�kkel �%s� (%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
-msgstr "Dette vil v�re en selvsignatur.\n"
+msgstr ""
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-eksporterbar.\n"
+msgstr ""
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-opphevbar.\n"
+msgstr ""
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
-msgstr "Signaturen vil bli markert som ikke-eksporterbar.\n"
+msgstr ""
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
-msgstr "Signaturen vil bli markert som ikke-opphevbar.\n"
+msgstr ""
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
-msgstr "Jeg har ikke sjekket denne n�kkelen i det hele tatt.\n"
+msgstr ""
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
-msgstr "Jeg har sjekket denne n�kkelen p� vanlig m�te.\n"
+msgstr ""
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
-msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
+msgstr ""
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
-msgstr "Virkelig signere? (j/N) "
+msgstr ""
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
-#, fuzzy, c-format
-#| msgid "error creating passphrase: %s\n"
++#: g10/keyedit.c:1207
+#, c-format
msgid "key %s: error changing passphrase: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
-msgstr "flytter en n�kkelsignatur til den rette plassen\n"
+msgstr ""
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
-msgstr "lagre og avslutte"
+msgstr ""
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
-msgstr "vise n�kkelens fingeravtrykk"
+msgstr ""
- #: g10/keyedit.c:1362
-#, fuzzy
-#| msgid "show this help"
++#: g10/keyedit.c:1373
msgid "show the keygrip"
-msgstr "vise denne hjelpen"
+msgstr ""
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
-msgstr "liste n�kler og brukerider"
+msgstr ""
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
-msgstr "velger brukerid N"
+msgstr ""
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
-msgstr "velger brukerid N"
+msgstr ""
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
-msgstr "sjekke signaturer"
+msgstr ""
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
-msgstr "signerere utvalgte brukerider lokalt"
+msgstr ""
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
-msgstr "signere utvalgte brukerider med en tillitssignatur"
+msgstr ""
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
-msgstr "legge til en brukerid"
+msgstr ""
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
-msgstr "legge til en fotoid"
+msgstr ""
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
-msgstr "slette utvalgte brukerider"
+msgstr ""
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
-msgstr "legge til en undern�kkel"
+msgstr ""
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
-msgstr "slette utvalgte undern�kler"
+msgstr ""
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
-msgstr "legge til en opphevingsn�kkel"
+msgstr ""
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
-msgstr "slette signaturene fra de utvalgte brukeridene"
+msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
-msgstr "markere den valgte brukeriden som den prim�re"
+msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
-msgstr "liste preferanser (ekspert)"
+msgstr ""
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
-msgstr "liste preferanser (fyldig)"
+msgstr ""
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
-msgstr "sette preferanseliste for de valgte brukeridene"
+msgstr ""
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "sette URL for foretrukket n�kkelserver for de valgte brukeridene"
+msgstr ""
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
-msgstr "sette en notasjon for de valgte brukeridene"
+msgstr ""
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
-msgstr "endre passfrasen"
+msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
-msgstr "endre eiertilliten"
+msgstr ""
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
-msgstr "oppheve signaturene p� de valgte brukeridene"
+msgstr ""
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
-msgstr "oppheve utvalgte brukerider"
+msgstr ""
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
-msgstr "oppheve n�kkel eller utvalgte undern�kler"
+msgstr ""
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
-msgstr "innkoble en n�kkel"
+msgstr ""
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
-msgstr "utkoble en n�kkel"
+msgstr ""
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
-msgstr "vise utvalgte fotoider"
+msgstr ""
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
-msgstr "Hemmelig n�kkel er tilgjengelig\n"
+msgstr ""
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
-msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
+msgstr ""
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -3802,587 -3286,476 +3914,593 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
-msgstr "N�kkelen er opphevet."
+msgstr ""
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
-msgstr "Virkelig signerere alle brukerider? (j/N) "
+msgstr ""
- #: g10/keyedit.c:1753
-#, fuzzy
-#| msgid "Really sign all user IDs? (y/N) "
++#: g10/keyedit.c:1765
+ msgid "Really sign all text user IDs? (y/N) "
-msgstr "Virkelig signerere alle brukerider? (j/N) "
++msgstr ""
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
-msgstr "Tips: Velg brukeriden som skal signeres\n"
+msgstr ""
- #: g10/keyedit.c:1763
-#, fuzzy, c-format
-#| msgid "Unknown signature type `%s'\n"
++#: g10/keyedit.c:1784
+#, c-format
msgid "Unknown signature type '%s'\n"
-msgstr "Ukjent signaturtype �%s�\n"
+msgstr ""
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
-msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
+msgstr ""
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
-msgstr "Du m� velge minst en brukerid.\n"
+msgstr ""
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
-msgstr "Du kan ikke slette den siste brukeriden!\n"
+msgstr ""
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
-msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
+msgstr ""
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
-msgstr "Virkelig fjerne denne brukeriden? (j/N) "
+msgstr ""
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
-msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
+msgstr ""
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
-msgstr "Du m� velge minst en n�kkel.\n"
+msgstr ""
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
-#, fuzzy, c-format
-#| msgid "Can't open `%s': %s\n"
++#: g10/keyedit.c:1952
+#, c-format
msgid "Can't open '%s': %s\n"
-msgstr "Kan ikke �pne �%s�: %s\n"
+msgstr ""
- #: g10/keyedit.c:1947
-#, fuzzy, c-format
-#| msgid "Error reading backup key from `%s': %s\n"
++#: g10/keyedit.c:1968
+#, c-format
msgid "Error reading backup key from '%s': %s\n"
-msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
+msgstr ""
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
-msgstr "Du m� velge minst en n�kkel.\n"
+msgstr ""
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
-msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
-msgstr "Virkelig oppheve denne brukeriden? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "Vil du virkelig oppheve hele n�kkelen? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
-msgstr "sette preferanseliste til:\n"
+msgstr ""
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
-msgstr "Virkelig oppdatere preferansene? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
-msgstr "Lagre endringene? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
-msgstr "Avslutte uten � lagre? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
-msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
+msgstr ""
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr ""
-
- #: g10/keyedit.c:2462
-#, fuzzy, c-format
-#| msgid "invalid fingerprint"
++#: g10/keyedit.c:2489
+#, c-format
msgid "\"%s\" is not a fingerprint\n"
-msgstr "ugyldig fingeravtrykk"
+msgstr ""
- #: g10/keyedit.c:2494
-#, fuzzy, c-format
++#: g10/keyedit.c:2521
+#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
-msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+msgstr ""
- #: g10/keyedit.c:2548
-#, fuzzy
-#| msgid "No such user ID.\n"
++#: g10/keyedit.c:2575
msgid "No matching user IDs."
-msgstr "Det finnes ingen slik brukerid.\n"
+msgstr ""
- #: g10/keyedit.c:2548
-#, fuzzy
-#| msgid "Nothing to sign with key %s\n"
++#: g10/keyedit.c:2575
msgid "Nothing to sign.\n"
-msgstr "Ingenting � signere med n�kkelen %s\n"
+msgstr ""
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
-msgstr "Digest: "
+msgstr ""
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
-msgstr "S�rtrekk: "
+msgstr ""
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
-msgstr "Notasjoner: "
+msgstr ""
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
+msgstr ""
- #: g10/keyedit.c:3058
-#, fuzzy, c-format
++#: g10/keyedit.c:3096
+#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
-msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
+msgstr ""
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
-msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
+msgstr ""
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
-msgstr "(sensitiv)"
+msgstr ""
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
-msgstr "opprettet: %s"
+msgstr ""
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
-msgstr "opphevet: %s"
+msgstr ""
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
-msgstr "utgikk: %s"
+msgstr ""
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
-msgstr "utg�r: %s"
+msgstr ""
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
-msgstr "bruksm�te: %s"
+msgstr ""
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
-msgstr "tillit: %s"
+msgstr ""
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
-msgstr "gyldighet: %s"
+msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
-msgstr "Denne n�kkelen har blitt utkoblet"
+msgstr ""
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
-msgstr "opphevet"
+msgstr ""
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
-msgstr "utg�tt"
+msgstr ""
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
msgid "You may want to change its expiration date too.\n"
msgstr ""
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
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 ""
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Er du sikker p� at du vil legge den til? (j/N) "
+msgstr ""
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
-msgstr "Slette denne gode signaturen? (j/N/a)"
+msgstr ""
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr ""
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr ""
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
-msgstr "Slettet %d signatur.\n"
+msgstr ""
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
-msgstr "Slettet %d signaturer.\n"
+msgstr ""
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
-msgstr "Ingen ble slettet.\n"
+msgstr ""
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
-msgstr "ugyldig"
+msgstr ""
- #: g10/keyedit.c:3724
-#, fuzzy, c-format
++#: g10/keyedit.c:3762
+#, c-format
msgid "User ID \"%s\" compacted: %s\n"
-msgstr "brukerid �%s�: allerede renset\n"
+msgstr ""
- #: g10/keyedit.c:3731
-#, fuzzy, c-format
++#: g10/keyedit.c:3769
+#, c-format
msgid "User ID \"%s\": %d signature removed\n"
-msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr ""
- #: g10/keyedit.c:3732
-#, fuzzy, c-format
++#: g10/keyedit.c:3770
+#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
-msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr ""
- #: g10/keyedit.c:3740
-#, fuzzy, c-format
++#: g10/keyedit.c:3778
+#, c-format
msgid "User ID \"%s\": already minimized\n"
-msgstr "brukerid �%s�: allerede renset\n"
+msgstr ""
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
-msgstr "brukerid �%s�: allerede renset\n"
+msgstr ""
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
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 ""
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr ""
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr ""
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
-"Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
-"N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
++#: g10/keyedit.c:4014
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
msgstr ""
-"Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
-"N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr ""
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr ""
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
- #: g10/keyedit.c:4095
-#, fuzzy, c-format
++#: g10/keyedit.c:4140
+#, c-format
msgid "signing subkey %s is already cross-certified\n"
-msgstr "Undern�kkel %s er allerede opphevet.\n"
+msgstr ""
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr ""
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
+msgstr ""
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
-msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
+msgstr ""
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Er du sikker p� at du vil slette den? (j/N) "
+msgstr ""
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr ""
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr ""
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr ""
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr ""
- #: g10/keyedit.c:4882
-#, fuzzy, c-format
-#| msgid "Nothing to sign with key %s\n"
++#: g10/keyedit.c:4992
++#, c-format
+ msgid "No subkey with key ID '%s'.\n"
-msgstr "Ingenting � signere med n�kkelen %s\n"
++msgstr ""
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr ""
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr ""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
-msgstr " (ikke-eksporterbar)"
+msgstr ""
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
-msgstr "Denne signaturen utgikk den %s.\n"
+msgstr ""
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr ""
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr ""
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
-msgstr " (ikke-opphevbar)"
+msgstr ""
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr ""
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr ""
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
-msgstr "ingen hemmelig n�kkel\n"
+msgstr ""
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
-msgstr "brukerid �%s� er allerede opphevet\n"
+msgstr ""
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
+msgstr ""
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
-msgstr "N�kkelen %s er allerede opphevet.\n"
+msgstr ""
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
-msgstr "Undern�kkel %s er allerede opphevet.\n"
+msgstr ""
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#, fuzzy, c-format
-#| msgid "preference `%s' duplicated\n"
+#: g10/keygen.c:276
+#, c-format
msgid "preference '%s' duplicated\n"
-msgstr "preferansen %s er duplisert\n"
+msgstr ""
+#: g10/keygen.c:283
msgid "too many cipher preferences\n"
-msgstr "for mange cipher-preferanser\n"
+msgstr ""
+#: g10/keygen.c:285
msgid "too many digest preferences\n"
-msgstr "for mange digest-preferanser\n"
+msgstr ""
+#: g10/keygen.c:287
msgid "too many compression preferences\n"
-msgstr "for mange kompresjons-preferanser\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "invalid item `%s' in preference string\n"
+#: g10/keygen.c:428
+#, c-format
msgid "invalid item '%s' in preference string\n"
-msgstr "ugyldig oppf�ring �%s� i preferansestreng\n"
+msgstr ""
+#: g10/keygen.c:907
msgid "writing direct signature\n"
-msgstr "skriver direkte signatur\n"
+msgstr ""
+#: g10/keygen.c:953
msgid "writing self signature\n"
-msgstr "skriver selvsignatur\n"
+msgstr ""
+#: g10/keygen.c:1009
msgid "writing key binding signature\n"
-msgstr "skriver n�kkelbindende signatur\n"
+msgstr ""
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
-msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
+msgstr ""
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
-msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
+msgstr ""
+#: g10/keygen.c:1470
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
@@@ -4637,55 -3987,59 +4755,60 @@@ msgid "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
msgstr ""
-"\n"
-"Du trenger en brukerid for � identifisere n�kkelen din;\n"
-"programvaren konstruerer brukeriden ut fra fullt navn, kommentar og\n"
-"epostadresse til denne formen:\n"
-" �Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>�\n"
-"\n"
+#: g10/keygen.c:2531
msgid "Real name: "
-msgstr "Fullt navn: "
+msgstr ""
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
-msgstr "Ugyldig tegn i navn\n"
+msgstr ""
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
-msgstr "Navnet kan ikke starte med et siffer\n"
+msgstr ""
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
-msgstr "Navnet m� v�re minst 5 tegn langt\n"
+msgstr ""
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
-msgstr "Epostadresse: "
+msgstr ""
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
-msgstr "Ikke en gyldig epostadresse\n"
+msgstr ""
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
-msgstr "Kommentar: "
+msgstr ""
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
-msgstr "Ugyldig tegn i kommentar\n"
+msgstr ""
- #: g10/keygen.c:2599
-#, fuzzy, c-format
-#| msgid "You are using the `%s' character set.\n"
++#: g10/keygen.c:2603
+#, c-format
msgid "You are using the '%s' character set.\n"
-msgstr "Du bruker tegnsettet �%s�.\n"
+msgstr ""
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
" \"%s\"\n"
"\n"
msgstr ""
-"Du valgte denne brukeriden:\n"
-" �%s�\n"
-"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-"Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
@@@ -4698,73 -4052,76 +4821,73 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
-msgstr "NnKeEeRrAa"
+msgstr ""
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
+msgstr ""
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
+msgstr ""
- #: g10/keygen.c:2651
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
++#: g10/keygen.c:2655
msgid "Change (N)ame, (E)mail, or (Q)uit? "
-msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
+msgstr ""
- #: g10/keygen.c:2652
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
++#: g10/keygen.c:2656
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
-msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
+msgstr ""
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
-msgstr "Vennligst korriger feilen f�rst\n"
+msgstr ""
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
-"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
-"\n"
- #: g10/keygen.c:2717
-#, fuzzy
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr ""
-"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
-"\n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
-msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
+msgstr ""
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
-msgstr "%s.\n"
+msgstr ""
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
"using this program with the option \"--edit-key\".\n"
"\n"
msgstr ""
-"Du vil ikke ha en passfrase - dette er sannsynligvis en *dum* id�!\n"
-"Jeg fortsetter likevel. Du kan endre passfrasen din n�r som helst ved\n"
-"hjelp av dette programmet og valget �--edit-key�.\n"
-"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
"disks) during the prime generation; this gives the random number\n"
"generator a better chance to gain enough entropy.\n"
msgstr ""
-"Vi trenger � generere ganske mange tilfeldige byter. Det er en god id�\n"
-"� utf�re andre oppgaver (skrive p� tastaturet, flytte p� musa, la\n"
-"diskene jobbe) under primtallgenereringen; dette gir\n"
-"tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
-msgstr "N�kkelgenerering mislyktes: %s\n"
+msgstr ""
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -4772,347 -4129,301 +4895,347 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
-#, fuzzy, c-format
-#| msgid "key already exists\n"
++#: g10/keygen.c:3543
+#, c-format
msgid "A key for \"%s\" already exists\n"
-msgstr "n�kkel finnes allerede\n"
+msgstr ""
- #: g10/keygen.c:3541
-#, fuzzy
-#| msgid "Use this key anyway? (y/N) "
++#: g10/keygen.c:3548
msgid "Create anyway? (y/N) "
-msgstr "Bruke denne n�kkelen likevel? (j/N) "
+msgstr ""
- #: g10/keygen.c:3546
-#, fuzzy
-#| msgid "generating new key\n"
++#: g10/keygen.c:3553
msgid "creating anyway\n"
-msgstr "generere en ny n�kkel\n"
+msgstr ""
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
-msgstr "N�kkelgenereringen ble avbrutt.\n"
+msgstr ""
- #: g10/keygen.c:4014 g10/keygen.c:4156
-#, fuzzy, c-format
-#| msgid "writing public key to `%s'\n"
++#: g10/keygen.c:4021 g10/keygen.c:4169
+#, c-format
msgid "writing public key to '%s'\n"
-msgstr "skriver offentlig n�kkel til �%s�\n"
+msgstr ""
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
-msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
+msgstr ""
- #: g10/keygen.c:4164
-#, fuzzy, c-format
-#| msgid "error writing public keyring `%s': %s\n"
++#: g10/keygen.c:4177
+#, c-format
msgid "error writing public keyring '%s': %s\n"
-msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
+msgstr ""
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
-msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
+msgstr ""
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
-"Merk at denne n�kkelen ikke kan brukes for kryptering. Du �nsker\n"
-"kanskje � bruke kommandoen �--edit-key� for � generere en\n"
-"sekund�rn�kkel for dette form�let.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
-# Er dette entallsformen av denne strengen?
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-"n�kkel har blitt opprettet %lu sekund i fremtiden (time warp eller "
-"klokkeproblem)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
-# Er dette flertallsformen av denne og den forrige strengen?
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-"n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
-"klokkeproblem)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
-#, fuzzy
-#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
++#: g10/keygen.c:4293 g10/keygen.c:4416
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-"MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
-"OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
-msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
+msgstr ""
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
+msgstr ""
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
-msgstr "Virkelig opprette? (j/N)"
+msgstr ""
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
-msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
+msgstr ""
- #: g10/keygen.c:4661
-#, fuzzy, c-format
-#| msgid "can't create backup file `%s': %s\n"
++#: g10/keygen.c:4674
+#, c-format
msgid "can't create backup file '%s': %s\n"
-msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+msgstr ""
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr ""
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr ""
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr ""
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr ""
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr ""
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr ""
- #: g10/keylist.c:446
-#, fuzzy
-#| msgid "1 bad signature\n"
++#: g10/keylist.c:468
msgid "1 good signature\n"
-msgstr "1 ubrukelig signatur\n"
+msgstr ""
- #: g10/keylist.c:448
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
++#: g10/keylist.c:470
+#, c-format
msgid "%d good signatures\n"
-msgstr "%d ubrukelige signaturer\n"
+msgstr ""
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
-msgstr "N�kkelknippe"
+msgstr ""
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
-msgstr "hoppet over �%s�: %s\n"
+msgstr ""
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
-msgstr "Fingeravtrykk for prim�rn�kkel:"
+msgstr ""
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
-msgstr " Fingeravtrykk for undern�kkel:"
+msgstr ""
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
-msgstr " Fingeravtrykk for prim�rn�kkel:"
+msgstr ""
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
-msgstr " Fingeravstrykk for undern�kkel:"
+msgstr ""
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
-msgstr " N�kkelfingeravtrykk ="
+msgstr ""
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
-msgstr " Serienummer for kort ="
+msgstr ""
- #: g10/keyring.c:1307
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
++#: g10/keyring.c:1402
+#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
- #: g10/keyring.c:1435
-#, fuzzy, c-format
-#| msgid "caching keyring `%s'\n"
++#: g10/keyring.c:1532
+#, c-format
msgid "caching keyring '%s'\n"
-msgstr "cacher n�kkelknippet �%s�\n"
+msgstr ""
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "%lu n�kler cachet s� langt (%lu signaturer)\n"
+msgstr ""
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
-msgstr "%lu n�kler cachet (%lu signaturer)\n"
+msgstr ""
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr ""
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
-msgstr "utkoblet"
+msgstr ""
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
-msgstr "oppfrisker 1 n�kkel fra %s\n"
+msgstr ""
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
+msgstr ""
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
-msgstr "oppfrisker %d n�kler fra %s\n"
+msgstr ""
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
-msgstr "n�kkelen �%s� ble ikke funnet p� n�kkelserveren\n"
+msgstr ""
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
-msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
+msgstr ""
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
-msgstr "ber om n�kkelen %s fra %s server %s\n"
+msgstr ""
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
-msgstr "ber om n�kkel %s fra %s\n"
+msgstr ""
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr ""
- #: g10/keyserver.c:1852
-#, fuzzy, c-format
-#| msgid "requesting key %s from %s\n"
++#: g10/keyserver.c:1856
+#, c-format
msgid "requesting key from '%s'\n"
-msgstr "ber om n�kkel %s fra %s\n"
+msgstr ""
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
+msgstr ""
+#: g10/mainproc.c:257
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
-msgstr "merkelig st�rrelse for en kryptert sesjonsn�kkel (%d)\n"
+msgstr ""
+#: g10/mainproc.c:305
#, c-format
msgid "%s encrypted session key\n"
msgstr ""
+#: g10/mainproc.c:315
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "passfrase er generert med en ukjent digest-algoritme %d\n"
+msgstr ""
+#: g10/mainproc.c:381
#, c-format
msgid "public key is %s\n"
-msgstr "offentlig n�kkel er %s\n"
+msgstr ""
+#: g10/mainproc.c:459
msgid "public key encrypted data: good DEK\n"
-msgstr "offentlig n�kkel-kryptert data: god DEK\n"
+msgstr ""
+#: g10/mainproc.c:492
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "kryptert med %u-bit %s-n�kkel, ID %s, opprettet %s\n"
+msgstr ""
- #: g10/mainproc.c:496 g10/pkclist.c:230
-# Do we really need to translate this string.
-# The must some bug in the code.
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
-msgstr " �%s�\n"
+msgstr ""
+#: g10/mainproc.c:500
#, c-format
msgid "encrypted with %s key, ID %s\n"
-msgstr "kryptert med %s-n�kkel, ID %s\n"
+msgstr ""
+#: g10/mainproc.c:517
#, c-format
msgid "public key decryption failed: %s\n"
-msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
+msgstr ""
+#: g10/mainproc.c:533
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr ""
@@@ -5143,255 -4448,211 +5266,255 @@@ msgstr "
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr ""
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
-msgstr "dekryptering mislyktes: %s\n"
+msgstr ""
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
-msgstr "opprinnelig filnavn=�%.*s�\n"
+msgstr ""
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
-msgstr "ingen signatur ble funnet\n"
+msgstr ""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
-msgstr "D�RLIG signatur fra �%s�"
+msgstr ""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
-msgstr "Utg�tt signatur fra �%s�"
+msgstr ""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
-msgstr "God signatur fra �%s�"
+msgstr ""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr ""
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr ""
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
-msgstr "Signatur opprettet %s\n"
+msgstr ""
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
-msgstr " bruker %s n�kkel %s\n"
+msgstr ""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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"
+msgstr ""
- #: g10/mainproc.c:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
-msgstr "N�kkel tilgjengelig ved: "
+msgstr ""
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
-msgstr "[usikker]"
+msgstr ""
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
-msgstr " aka �%s�"
+msgstr ""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
-msgstr "Signatur utg�tt %s\n"
+msgstr ""
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
-msgstr "Signatur utg�r %s\n"
+msgstr ""
- #: g10/mainproc.c:2039
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
++#: g10/mainproc.c:2078
+#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
-msgstr "%s signatur, digestalgoritme %s\n"
+msgstr ""
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
msgid "binary"
-msgstr "bin�r"
+msgstr ""
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
-msgstr "tekstmodus"
+msgstr ""
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
-msgstr "ukjent"
+msgstr ""
- #: g10/mainproc.c:2043
-#, fuzzy
-#| msgid "unknown pubkey algorithm"
++#: g10/mainproc.c:2082
msgid ", key algorithm "
-msgstr "ukjent pubkey-algoritme"
+msgstr ""
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr ""
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr ""
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr ""
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr ""
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
-#, fuzzy, c-format
-#| msgid "fstat(%d) failed in %s: %s\n"
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
+#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
-msgstr "fstat(%d) mislyktes in %s: %s\n"
+msgstr ""
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
-msgstr "fstat(%d) mislyktes in %s: %s\n"
+msgstr ""
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "ADVARSEL: bruker eksperimentell offentlig n�kkel-algoritme %s\n"
+msgstr ""
- #: g10/misc.c:287
-#, fuzzy
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
-msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
+msgstr ""
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
+msgstr ""
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
+msgstr ""
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
+msgstr ""
- #: g10/misc.c:339
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
++#: g10/misc.c:355
+#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s signatur, digestalgoritme %s\n"
+msgstr ""
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr ""
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr ""
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr ""
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr ""
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr ""
- #: g10/misc.c:1408
-#, fuzzy, c-format
-#| msgid "ambiguous option `%s'\n"
++#: g10/misc.c:1423
+#, c-format
msgid "ambiguous option '%s'\n"
-msgstr "flertydig valg �%s�\n"
+msgstr ""
- #: g10/misc.c:1433
-#, fuzzy, c-format
-#| msgid "unknown option `%s'\n"
++#: g10/misc.c:1448
+#, c-format
msgid "unknown option '%s'\n"
-msgstr "ukjent valg �%s�\n"
+msgstr ""
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
-#, fuzzy, c-format
-#| msgid "Unknown signature type `%s'\n"
++#: g10/misc.c:1708
++#, c-format
+ msgid "unknown weak digest '%s'\n"
-msgstr "Ukjent signaturtype �%s�\n"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "File `%s' exists. "
+#: g10/openfile.c:85
+#, c-format
msgid "File '%s' exists. "
-msgstr "Fila �%s� finnes. "
+msgstr ""
+#: g10/openfile.c:89
msgid "Overwrite? (y/N) "
-msgstr "Overskrive (j/N) "
+msgstr ""
+#: g10/openfile.c:124
#, c-format
msgid "%s: unknown suffix\n"
msgstr ""
@@@ -5552,33 -4809,26 +5675,33 @@@ msgstr "
msgid "unable to display photo ID!\n"
msgstr ""
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
-msgstr "Ingen grunn er angitt"
+msgstr ""
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
-msgstr "N�kkelen er overg�tt"
+msgstr ""
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
-msgstr "N�kkelen har blitt kompromittert"
+msgstr ""
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
-msgstr "N�kkelen er ikke lengre i bruk"
+msgstr ""
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
-msgstr "Brukerid er ikke lengre gyldig"
+msgstr ""
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
-msgstr "grunnen for opphevelse: "
+msgstr ""
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
-msgstr "kommentar til opphevelse: "
+msgstr ""
#. TRANSLATORS: These are the allowed answers in lower and
#. uppercase. Below you will find the matching strings which
@@@ -5590,276 -4840,231 +5713,276 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
-msgstr "iImMqQsS"
+msgstr ""
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
-msgstr "Ingen tillitsverdi tilordnet til:\n"
+msgstr ""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
-msgstr " aka �%s�\n"
+msgstr ""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
-"Hvor mye stoler du p� at denne n�kkelen faktisk tilh�rer den angitte "
-"brukeren?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
-msgstr " %d = Jeg vet ikke eller vil ikke uttale meg\n"
+msgstr ""
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
-msgstr " %d = Jeg stoler IKKE p� den\n"
+msgstr ""
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
-msgstr " %d = Jeg stoler fullstendig p� den\n"
+msgstr ""
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
-msgstr " m = tilbake til hovedmenyen\n"
+msgstr ""
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
-msgstr " s = hopp over denne n�kkelen\n"
+msgstr ""
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
-msgstr " q = avslutt\n"
+msgstr ""
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
-msgstr "Valget ditt? "
+msgstr ""
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "Vil du virkelig sette denne n�kkelen til fullstendig tillit? (j/N) "
+msgstr ""
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Sertifikater som f�rer til en fullstendig betrodd n�kkel:\n"
+msgstr ""
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
-"%s: Det finnes ingen indikasjon p� at denne n�kkelen faktisk tilh�rer den "
-"angitte eieren\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
-"%s: Det er begrenset indikasjon p� at denne n�kkelen faktisk tilh�rer den "
-"angitte eieren\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
-msgstr "Denne n�kkelen tilh�rer sannsynligvis den angitte eieren\n"
+msgstr ""
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
-msgstr "denne n�kkelen tilh�rer oss\n"
+msgstr ""
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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 ""
-"Det er IKKE sikkert at n�kkelen tilh�rer personen som er angitt i\n"
-"brukeriden. Dersom du *virkelig* vet hva du gj�r, kan du besvare det\n"
-"neste sp�rsm�let med ja.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
-msgstr "Bruke denne n�kkelen likevel? (j/N) "
+msgstr ""
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
-msgstr "ADVARSEL: Bruker ubetrodd n�kkel!\n"
+msgstr ""
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr ""
-"ADVARSEL: Denne n�kkelen har blitt opphevet av den utpekte oppheveren!\n"
- #: g10/pkclist.c:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "ADVARSEL: Denne n�kkelen har blitt opphevet av dens eier!\n"
+msgstr ""
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
-msgstr " Dette kan bety at signaturen er falsk.\n"
+msgstr ""
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "ADVARSEL: Denne undern�kkelen har blitt opphevet av eieren!\n"
+msgstr ""
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
-msgstr "Merk: Denne n�kkelen har blitt utkoblet.\n"
+msgstr ""
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
-msgstr "Merk: Denne n�kkelen er utg�tt!\n"
+msgstr ""
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
-"ADVARSEL: Denne n�kkelen er ikke sertifisert med en betrodd signatur!\n"
- #: g10/pkclist.c:632
++#: g10/pkclist.c:633
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"
+msgstr ""
- #: g10/pkclist.c:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
-msgstr "ADVARSEL: Vi stoler IKKE p� denne n�kkelen!\n"
+msgstr ""
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
-msgstr " Signaturen er sannsynligvis et FALSKNERI.\n"
+msgstr ""
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
-"ADVARSEL: Denne n�kkelen er ikke sertifisert med tilstrekkelige betrodde "
-"signaturer!\n"
- #: g10/pkclist.c:651
++#: g10/pkclist.c:652
msgid " It is not certain that the signature belongs to the owner.\n"
-msgstr " Det er ikke sikkert at signaturen tilh�rer brukeren.\n"
+msgstr ""
- #: g10/pkclist.c:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
-msgstr "%s: hoppet over: %s\n"
+msgstr ""
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
+msgstr ""
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
-msgstr "%s: hoppet over: offentlig n�kkel er allerede tilstede\n"
+msgstr ""
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "Du oppga ikke en brukerid. (Du kan bruke �-r�)\n"
+msgstr ""
- #: g10/pkclist.c:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
-"\n"
-"Tast inn brukeriden. Avslutt med en blank linje: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
-msgstr "Det finnes ingen slik brukerid.\n"
+msgstr ""
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
-msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
+msgstr ""
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
-msgstr "Offentlig n�kkel er utkoblet.\n"
+msgstr ""
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
-msgstr "hoppet over: offentlig n�kkel er allerede satt\n"
+msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
-msgstr "ukjent standardmottaker �%s�\n"
+msgstr ""
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
-msgstr "ingen gyldige adressater\n"
+msgstr ""
- #: g10/pkclist.c:1541
-#, fuzzy, c-format
++#: g10/pkclist.c:1543
+#, c-format
msgid "Note: key %s has no %s feature\n"
-msgstr "n�kkel %s: ingen brukerid\n"
+msgstr ""
- #: g10/pkclist.c:1566
-#, fuzzy, c-format
++#: g10/pkclist.c:1568
+#, c-format
msgid "Note: key %s has no preference for %s\n"
-msgstr "n�kkel %s: ingen brukerid\n"
+msgstr ""
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
+#, c-format
msgid "error creating '%s': %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr ""
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr ""
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr ""
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr ""
- #: g10/plaintext.c:658
-#, fuzzy, c-format
++#: g10/plaintext.c:700
+#, c-format
msgid "can't open signed data '%s'\n"
-msgstr "kan ikke �pne �%s�: %s\n"
+msgstr ""
- #: g10/plaintext.c:693
-#, fuzzy, c-format
++#: g10/plaintext.c:735
+#, c-format
msgid "can't open signed data fd=%d: %s\n"
-msgstr "kan ikke �pne �%s�: %s\n"
+msgstr ""
+#: g10/pubkey-enc.c:117
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr ""
@@@ -5881,62 -5082,58 +6004,66 @@@ msgstr "
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
-"p�tvinging av kompresjonsalgoritme %s bryter med mottakerens preferanser\n"
-#, fuzzy, c-format
-#| msgid "NOTE: secret key %s expired at %s\n"
+#: g10/pubkey-enc.c:378
+#, c-format
msgid "Note: secret key %s expired at %s\n"
-msgstr "NOTIS: hemmelig n�kkel %s utgikk den %s\n"
+msgstr ""
-#, fuzzy
+#: g10/pubkey-enc.c:385
msgid "Note: key has been revoked"
-msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
+msgstr ""
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr ""
+#: g10/revoke.c:145
#, c-format
msgid "key %s has no user IDs\n"
-msgstr "n�kkel %s: ingen brukerid\n"
+msgstr ""
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr ""
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr ""
- #: g10/revoke.c:316
-#, fuzzy
-#| msgid "Secret key is available.\n"
++#: g10/revoke.c:323
+ msgid "Secret key is not available.\n"
-msgstr "Hemmelig n�kkel er tilgjengelig\n"
++msgstr ""
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "Lage et utpekt opphevingssertifikat for denne n�kkelen? (j/N) "
+msgstr ""
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr ""
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr ""
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr ""
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:544
-#, fuzzy
-#| msgid "Create a revocation certificate for this key? (y/N) "
++#: g10/revoke.c:552
msgid "This is a revocation certificate for the OpenPGP key:"
-msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
+msgstr ""
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -5944,18 -5141,27 +6071,31 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
-#, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
++#: g10/revoke.c:628
++#, c-format
+ msgid "secret key \"%s\" not found\n"
-msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
++msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
+msgstr ""
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -5966,41 -5172,32 +6106,41 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr ""
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr ""
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
-msgstr "Er dette i orden? (j/N) "
+msgstr ""
+#: g10/seskey.c:61 sm/encrypt.c:123
msgid "weak key created - retrying\n"
-msgstr "svak n�kkel ble opprettet - pr�ver p� nytt\n"
+msgstr ""
+#: g10/seskey.c:65
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
@@@ -6015,73 -5212,66 +6155,73 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr ""
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
-msgstr "vennligst se %s for mer informasjon\n"
+msgstr ""
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr ""
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr ""
- #: g10/sig-check.c:234
-# Er dette entallsformen av denne strengen?
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr ""
-"n�kkel %s ble opprettet %lu sekund i fremtiden (time warp eller "
-"klokkeproblem)\n"
- #: g10/sig-check.c:236
-# Er dette flertallsformen av denne og den forrige strengen?
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr ""
-"n�kkel %s ble opprettet %lu sekunder i fremtiden (time warp eller "
-"klokkeproblem)\n"
- #: g10/sig-check.c:250
-#, fuzzy, c-format
-#| msgid "NOTE: signature key %s expired %s\n"
++#: g10/sig-check.c:299
+#, c-format
msgid "Note: signature key %s expired %s\n"
-msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
+msgstr ""
- #: g10/sig-check.c:261
-#, fuzzy, c-format
++#: g10/sig-check.c:310
+#, c-format
msgid "Note: signature key %s has been revoked\n"
-msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
+msgstr ""
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "n�kkel %s: ingen undern�kkel for undern�kkelopphevingssignatur\n"
+msgstr ""
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
+msgstr ""
+#: g10/sign.c:89
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
@@@ -6114,29 -5301,23 +6254,29 @@@ msgstr "
msgid "signing:"
msgstr ""
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr ""
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
-msgstr "hoppet over �%s�: er duplikat\n"
+msgstr ""
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr ""
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr ""
@@@ -6161,25 -5339,22 +6301,25 @@@ msgstr "
msgid "colon missing"
msgstr ""
+#: g10/tdbdump.c:177
msgid "invalid fingerprint"
-msgstr "ugyldig fingeravtrykk"
+msgstr ""
+#: g10/tdbdump.c:182
msgid "ownertrust value missing"
-msgstr "verdi for eiertillit mangler"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "error finding trust record in `%s': %s\n"
+#: g10/tdbdump.c:218
+#, c-format
msgid "error finding trust record in '%s': %s\n"
-msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "read error in `%s': %s\n"
+#: g10/tdbdump.c:222
+#, c-format
msgid "read error in '%s': %s\n"
-msgstr "lesefeil ved �%s�: %s\n"
+msgstr ""
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr ""
@@@ -6208,12 -5380,11 +6348,12 @@@ msgstr "
msgid "trustdb transaction too large\n"
msgstr ""
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
-#, fuzzy, c-format
-#| msgid "can't access `%s': %s\n"
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
+#, c-format
msgid "can't access '%s': %s\n"
-msgstr "kan ikke aksere �%s�: %s\n"
+msgstr ""
+#: g10/tdbio.c:688
#, c-format
msgid "%s: directory does not exist!\n"
msgstr ""
@@@ -6322,117 -5472,94 +6462,117 @@@ msgstr "
msgid "input line longer than %d characters\n"
msgstr ""
- #: g10/trustdb.c:215
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid character set\n"
++#: g10/trustdb.c:216
+#, c-format
msgid "'%s' is not a valid long keyID\n"
-msgstr "�%s� er ikke et gyldig tegnsett\n"
+msgstr ""
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
-msgstr "n�kkel %s: godtatt som betrodd n�kkel\n"
+msgstr ""
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr ""
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "n�kkel %s: ingen offentlig n�kkel for betrodd n�kkel - hoppet over\n"
+msgstr ""
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
-msgstr "n�kkel %s markert som endelig betrodd.\n"
+msgstr ""
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr ""
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr ""
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr ""
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr ""
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr ""
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr ""
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
-msgstr "fant ikke offentlig n�kkel %s: %s\n"
+msgstr ""
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr ""
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr ""
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr ""
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr ""
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -6635,38 -5726,31 +6775,38 @@@ msgstr "
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
+#: scd/app-openpgp.c:1730
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+msgstr ""
-#, fuzzy
+#: scd/app-openpgp.c:1741 scd/app-openpgp.c:2213
msgid "||Please enter the PIN"
-msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+msgstr ""
+#: scd/app-openpgp.c:1783 scd/app-openpgp.c:1962 scd/app-openpgp.c:2226
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
+msgstr ""
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1974
+#: scd/app-openpgp.c:3924
#, c-format
msgid "verify CHV%d failed: %s\n"
-msgstr "bekreftelse av CHV%d mislyktes: %s\n"
+msgstr ""
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
-msgstr "feil ved henting av CHV-status fra kort\n"
+msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
-msgstr "kort er permanent l�st!\n"
+msgstr ""
+#: scd/app-openpgp.c:1877
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
+msgstr ""
#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
#. the start of the string. Use %%0A to force a linefeed.
@@@ -6778,29 -5844,25 +6918,29 @@@ msgstr "
msgid "fingerprint on card does not match requested one\n"
msgstr ""
+#: scd/app-openpgp.c:3814
#, c-format
msgid "card does not support digest algorithm %s\n"
-msgstr "kortet st�tter ikke digestalgoritme %s\n"
+msgstr ""
+#: scd/app-openpgp.c:3899
#, c-format
msgid "signatures created so far: %lu\n"
-msgstr "signaturer opprettet s� langt: %lu\n"
+msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
-msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
+msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
+msgstr ""
-#, fuzzy
+#: scd/app-dinsig.c:299
msgid "||Please enter your PIN at the reader's pinpad"
-msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
@@@ -6813,7 -5874,6 +6953,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -6867,12 -5918,10 +7007,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7234,52 -6223,43 +7374,52 @@@ msgstr "
msgid "line %d: invalid issuer name '%s' at pos %d\n"
msgstr ""
-#, fuzzy, c-format
+#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#, c-format
msgid "line %d: invalid date given\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/certreqgen.c:599
+#, c-format
msgid "line %d: error getting signing key by keygrip '%s': %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/certreqgen.c:618
+#, c-format
msgid "line %d: invalid hash algorithm given\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/certreqgen.c:633
+#, c-format
msgid "line %d: invalid authority-key-id\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "key %s: invalid subkey binding\n"
+#: sm/certreqgen.c:648
+#, c-format
msgid "line %d: invalid subject-key-id\n"
-msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/certreqgen.c:686
+#, c-format
msgid "line %d: invalid extension syntax\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/certreqgen.c:699
+#, c-format
msgid "line %d: error reading key '%s' from card: %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/certreqgen.c:712
+#, c-format
msgid "line %d: error getting key by keygrip '%s': %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/certreqgen.c:729
+#, c-format
msgid "line %d: key generation failed: %s <%s>\n"
-msgstr "N�kkelgenerering mislyktes: %s\n"
+msgstr ""
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -7824,125 -6725,107 +7964,125 @@@ msgstr "
msgid " subject ="
msgstr ""
-#, fuzzy, c-format
+#: dirmngr/certcache.c:416
+#, c-format
msgid "error loading certificate '%s': %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/certcache.c:492
+#, c-format
msgid "permanently loaded certificates: %u\n"
-msgstr "ugyldig sertifikat"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/certcache.c:494
+#, c-format
msgid " runtime cached certificates: %u\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
-#, fuzzy
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
msgid "certificate already cached\n"
-msgstr "preferansen %s er duplisert\n"
+msgstr ""
-#, fuzzy
+#: dirmngr/certcache.c:511
msgid "certificate cached\n"
-msgstr "preferansen %s er duplisert\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
+#, c-format
msgid "error caching certificate: %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "invalid fingerprint"
+#: dirmngr/certcache.c:596
+#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
-msgstr "ugyldig fingeravtrykk"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
+#, c-format
msgid "error fetching certificate by S/N: %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
+#, c-format
msgid "error fetching certificate by subject: %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+msgstr ""
-#, fuzzy
+#: dirmngr/certcache.c:1318 dirmngr/validate.c:459
msgid "no issuer found in certificate\n"
-msgstr "generere et opphevingssertifikat"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/certcache.c:1328
+#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "can't create directory `%s': %s\n"
+#: dirmngr/crlcache.c:213
+#, c-format
msgid "creating directory '%s'\n"
-msgstr "kan ikke opprette katalogen �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:217
+#, c-format
msgid "error creating directory '%s': %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:245
+#, c-format
msgid "ignoring database dir '%s'\n"
-msgstr "feil i trailerlinje\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:254
+#, c-format
msgid "error reading directory '%s': %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:275
+#, c-format
msgid "removing cache file '%s'\n"
-msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "enarmoring failed: %s\n"
+#: dirmngr/crlcache.c:284
+#, c-format
msgid "not removing file '%s'\n"
-msgstr "enarmoring failed: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
+#, c-format
msgid "error closing cache file: %s\n"
-msgstr "feil med �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
+#, c-format
msgid "failed to open cache dir file '%s': %s\n"
-msgstr "Kan ikke �pne �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:421
+#, c-format
msgid "error creating new cache dir file '%s': %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "error writing secret keyring `%s': %s\n"
+#: dirmngr/crlcache.c:428
+#, c-format
msgid "error writing new cache dir file '%s': %s\n"
-msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:435
+#, c-format
msgid "error closing new cache dir file '%s': %s\n"
-msgstr "feil med �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
+#: dirmngr/crlcache.c:440
+#, c-format
msgid "new cache dir file '%s' created\n"
-msgstr "ny konfigurasjonsfil �%s� ble opprettet\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:445
+#, c-format
msgid "failed to re-open cache dir file '%s': %s\n"
-msgstr "kan ikke opprette katalogen �%s�: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:473
#, c-format
msgid "first record of '%s' is not the version\n"
msgstr ""
@@@ -8121,222 -6973,186 +8261,222 @@@ msgstr "
msgid "S/N %s is valid, it is not listed in the CRL\n"
msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:1378
+#, c-format
msgid "error getting data from cache file: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
+#, c-format
msgid "unknown hash algorithm '%s'\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr ""
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
+#, c-format
msgid "converting S-expression failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
+#, c-format
msgid "creating S-expression failed: %s\n"
-msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1697
-#, fuzzy, c-format
-#| msgid "keyserver send failed: %s\n"
++#: dirmngr/crlcache.c:1698
+#, c-format
msgid "ksba_crl_parse failed: %s\n"
-msgstr "sending til n�kkelserver mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1711
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:1713
+#, c-format
msgid "error getting update times of CRL: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
-#, fuzzy, c-format
-#| msgid "error getting new PIN: %s\n"
++#: dirmngr/crlcache.c:1744
+#, c-format
msgid "error getting CRL item: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1757
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:1759
+#, c-format
msgid "error inserting item into temporary cache file: %s\n"
-msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1784
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:1786
+#, c-format
msgid "no CRL issuer found in CRL: %s\n"
-msgstr "generere et opphevingssertifikat"
+msgstr ""
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
-#, fuzzy, c-format
-#| msgid "Key generation failed: %s\n"
++#: dirmngr/crlcache.c:1846
+#, c-format
msgid "CRL signature verification failed: %s\n"
-msgstr "N�kkelgenerering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1855
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:1857
+#, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1998
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2000
+#, c-format
msgid "ksba_crl_new failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2005
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2007
+#, c-format
msgid "ksba_crl_set_reader failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2039
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2041
+#, c-format
msgid "removed stale temporary cache file '%s'\n"
-msgstr "kan ikke opprette katalogen �%s�: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2043
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2045
+#, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
-msgstr "kan ikke opprette katalogen �%s�: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2053
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2055
+#, c-format
msgid "error creating temporary cache file '%s': %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2063
-#, fuzzy, c-format
-#| msgid "update secret failed: %s\n"
++#: dirmngr/crlcache.c:2065
+#, c-format
msgid "crl_parse_insert failed: %s\n"
-msgstr "oppdatering av hemmelig mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2073
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2075
+#, c-format
msgid "error finishing temporary cache file '%s': %s\n"
-msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2080
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2082
+#, c-format
msgid "error closing temporary cache file '%s': %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2137
+#, c-format
msgid "error reading CRL extensions: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2186
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2188
+#, c-format
msgid "creating cache file '%s'\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2218
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
++#: dirmngr/crlcache.c:2220
+#, c-format
msgid "problem renaming '%s' to '%s': %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
-#, fuzzy
-#| msgid "WARNING: invalid size of random_seed file - not used\n"
++#: dirmngr/crlcache.c:2325
msgid " WARNING: invalid cache record length\n"
-msgstr "ADVARSEL: ugyldig st�rrelse p� random_seed-fila - ikke brukt\n"
+msgstr ""
- #: dirmngr/crlcache.c:2330
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2332
+#, c-format
msgid "problem reading cache record: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2341
-#, fuzzy, c-format
-#| msgid "error reading keyblock: %s\n"
++#: dirmngr/crlcache.c:2343
+#, c-format
msgid "problem reading cache key: %s\n"
-msgstr "feil ved lesing av n�kkelblokk: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2372
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2374
+#, c-format
msgid "error reading cache entry from db: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2498
+#, c-format
msgid "crl_fetch via DP failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2507
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2509
+#, c-format
msgid "crl_cache_insert via DP failed: %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:2567
-#, fuzzy, c-format
++#: dirmngr/crlcache.c:2569
+#, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
-msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+msgstr ""
+#: dirmngr/crlfetch.c:74
msgid "reader to file mapping table full - waiting\n"
msgstr ""
@@@ -8361,79 -7171,70 +8501,79 @@@ msgstr "
msgid "URL '%s' redirected to '%s' (%u)\n"
msgstr ""
-#, fuzzy
-#| msgid "too many cipher preferences\n"
+#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
msgid "too many redirections\n"
-msgstr "for mange cipher-preferanser\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlfetch.c:274
+#, c-format
msgid "error retrieving '%s': %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlfetch.c:279
+#, c-format
msgid "error retrieving '%s': http status %u\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
-#, fuzzy
+#: 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"
+ msgid "CRL access not possible due to Tor mode\n"
-msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/crlfetch.c:386
+#, c-format
msgid "certificate search not possible due to disabled %s\n"
-msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
-#, fuzzy
++#: dirmngr/dirmngr-client.c:73
msgid "add a certificate to the cache"
-msgstr "preferansen %s er duplisert\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:73
-#, fuzzy
++#: dirmngr/dirmngr-client.c:74
msgid "validate a certificate"
-msgstr "ugyldig sertifikat"
+msgstr ""
- #: dirmngr/dirmngr-client.c:74
-#, fuzzy
++#: dirmngr/dirmngr-client.c:75
msgid "lookup a certificate"
-msgstr "ugyldig sertifikat"
+msgstr ""
- #: dirmngr/dirmngr-client.c:75
-#, fuzzy
++#: dirmngr/dirmngr-client.c:76
msgid "lookup only locally stored certificates"
-msgstr "ugyldig sertifikat"
+msgstr ""
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
-#, fuzzy
++#: dirmngr/dirmngr-client.c:80
msgid "expect certificates in PEM format"
-msgstr "ugyldig sertifikat"
+msgstr ""
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
msgstr ""
- #: dirmngr/dirmngr-client.c:151
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
++#: dirmngr/dirmngr-client.c:150
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
-msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+msgstr ""
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -8441,301 -7242,238 +8581,274 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
+#, c-format
msgid "error reading certificate from stdin: %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:276
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:275
+#, c-format
msgid "error reading certificate from '%s': %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:305
++#, c-format
+ msgid "can't connect to the dirmngr: %s\n"
-msgstr "kan ikke �pne n�kkelknippet"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "update failed: %s\n"
++#: dirmngr/dirmngr-client.c:327
+#, c-format
msgid "lookup failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:331
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
++#: dirmngr/dirmngr-client.c:342
+#, c-format
msgid "loading CRL '%s' failed: %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:392
+#, c-format
msgid "validation of certificate failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
-#, fuzzy
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
msgid "certificate is valid\n"
-msgstr "preferansen %s er duplisert\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
-#, fuzzy
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
msgid "certificate has been revoked\n"
-msgstr "Denne n�kkelen er utg�tt!"
+msgstr ""
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
+#, c-format
msgid "certificate check failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:412
-#, fuzzy, c-format
-#| msgid "can't stat `%s': %s\n"
++#: dirmngr/dirmngr-client.c:423
+#, c-format
msgid "got status: '%s'\n"
-msgstr "kan ikke stat() �%s�: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:427
-#, fuzzy, c-format
-#| msgid "error writing secret keyring `%s': %s\n"
++#: dirmngr/dirmngr-client.c:438
+#, c-format
msgid "error writing base64 encoding: %s\n"
-msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:799
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:685
+#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
-"\n"
-"St�ttede algoritmer:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
-#, fuzzy
++#: dirmngr/dirmngr.c:162
msgid "|FILE|load CRL from FILE into cache"
-msgstr "leser valg fra �%s�\n"
+msgstr ""
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
-#, fuzzy
-#| msgid "Quit without saving? (y/N) "
++#: dirmngr/dirmngr.c:181
msgid "run without asking a user"
-msgstr "Avslutte uten � lagre? (j/N) "
+msgstr ""
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
-#, fuzzy
++#: dirmngr/dirmngr.c:201
msgid "|FILE|read LDAP server list from FILE"
-msgstr "leser valg fra �%s�\n"
+msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
-#, fuzzy
++#: dirmngr/dirmngr.c:209
msgid "|URL|use OCSP responder at URL"
-msgstr "kunne ikke parse n�kkelserverens URL\n"
+msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
-#, fuzzy
-#| msgid ""
-#| "@\n"
-#| "(See the man page for a complete listing of all commands and options)\n"
++#: dirmngr/dirmngr.c:241
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
"options)\n"
msgstr ""
-"@\n"
-"(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
- #: dirmngr/dirmngr.c:350
-#, fuzzy
++#: dirmngr/dirmngr.c:353
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
-msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+msgstr ""
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
-#, fuzzy, c-format
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
+#, c-format
msgid "usage: %s [options] "
-msgstr "bruksm�te: gpg [valg] "
+msgstr ""
- #: dirmngr/dirmngr.c:1104
-#, fuzzy
-#| msgid "%s not allowed with %s!\n"
++#: dirmngr/dirmngr.c:1124
msgid "colons are not allowed in the socket name\n"
-msgstr "%s er ikke tillatt sammen med %s!\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
+#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
-#, fuzzy, c-format
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
+#, c-format
msgid "processing CRL from '%s' failed: %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1582
-#, fuzzy, c-format
++#: dirmngr/dirmngr.c:1591
+#, c-format
msgid "%s:%u: line too long - skipped\n"
-msgstr "for lang linje"
+msgstr ""
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
-#, fuzzy, c-format
-#| msgid "invalid fingerprint"
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
+#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
-msgstr "ugyldig fingeravtrykk"
+msgstr ""
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
-#, fuzzy, c-format
-#| msgid "read error in `%s': %s\n"
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
+#, c-format
msgid "%s:%u: read error: %s\n"
-msgstr "lesefeil ved �%s�: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
-#, fuzzy
-#| msgid "not forced"
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
msgid "shutdown forced\n"
-msgstr "ikke tvunget"
+msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -8968,17 -7674,14 +9081,17 @@@ msgstr "
msgid "adding '%s:%d' to the ldap server list\n"
msgstr ""
-#, fuzzy, c-format
+#: dirmngr/ldap.c:98 dirmngr/misc.c:496
+#, c-format
msgid "malloc failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9000,21 -7700,19 +9113,21 @@@ msgstr "
msgid "bad URL encoding detected\n"
msgstr ""
-#, fuzzy, c-format
+#: dirmngr/ocsp.c:80
+#, c-format
msgid "error reading from responder: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "Error: Private DO too long (limit is %d characters).\n"
+#: dirmngr/ocsp.c:98
+#, c-format
msgid "response from server too large; limit is %d bytes\n"
-msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
+msgstr ""
-#, fuzzy
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
+ msgid "OCSP request not possible due to Tor mode\n"
-msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9157,76 -7831,67 +9270,81 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
-#, fuzzy, c-format
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
+#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
-#, fuzzy, c-format
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
+#, c-format
msgid "assuan_inquire failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1183
-#, fuzzy, c-format
++#: dirmngr/server.c:1227
+#, c-format
msgid "fetch_cert_by_url failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
-#, fuzzy, c-format
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
+#, c-format
msgid "error sending data: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: dirmngr/server.c:1333
-#, fuzzy, c-format
++#: dirmngr/server.c:1377
+#, c-format
msgid "start_cert_fetch failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1366
-#, fuzzy, c-format
++#: dirmngr/server.c:1410
+#, c-format
msgid "fetch_next_cert failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
-#, fuzzy, c-format
++#: dirmngr/server.c:2398
+#, c-format
msgid "can't allocate control structure: %s\n"
-msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+msgstr ""
- #: dirmngr/server.c:2304
-#, fuzzy, c-format
++#: dirmngr/server.c:2409
++#, c-format
+ msgid "failed to allocate assuan context: %s\n"
-msgstr "klarte ikke � lagre n�kkelen: %s\n"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "failed to initialize the TrustDB: %s\n"
++#: dirmngr/server.c:2430
+#, c-format
msgid "failed to initialize the server: %s\n"
-msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
+msgstr ""
- #: dirmngr/server.c:2312
-#, fuzzy, c-format
-#| msgid "failed to store the creation date: %s\n"
++#: dirmngr/server.c:2438
+#, c-format
msgid "failed to the register commands with Assuan: %s\n"
-msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
+msgstr ""
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
-#, fuzzy, c-format
-#| msgid "signing failed: %s\n"
++#: dirmngr/server.c:2497
+#, c-format
msgid "Assuan processing failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
+#: dirmngr/validate.c:201
msgid "accepting root CA not marked as a CA"
msgstr ""
@@@ -9463,11 -8079,9 +9581,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/hu.gmo
index d8de259,0000000..85a3247
mode 100644,000000..100644
Binary files differ
diff --cc po/hu.po
index d4267be,053e6e6..ce75925
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc L�szl� <nfl at nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "�rv�nytelen jelsz�
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -77,75 -65,59 +77,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "rossz jelsz�"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "A sor t�l hossz�!\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "A jelsz� t�l hossz�!\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "�rv�nytelen karakter a n�vben!\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "hib�s MPI"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "rossz jelsz�"
@@@ -155,25 -126,11 +155,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -246,11 -190,9 +246,11 @@@ msgstr "K�rem, adja meg a jelsz�t! Ezt
msgid "failed to create stream from socket: %s\n"
msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -393,42 -309,28 +393,42 @@@ msgstr "
"Opci�k:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "b�besz�d� m�d"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "m�g sz�kszav�bb m�d"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 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:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -513,11 -398,6 +513,11 @@@ msgstr "nem t�mogatott
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -533,145 -411,107 +533,144 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s nem hozhat� l�tre: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, 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:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: K�nyvt�rat l�trehoztam.\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
@@@ -687,8 -525,6 +686,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -696,9 -532,6 +695,9 @@@ msgstr "
"@Parancsok:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -752,7 -577,6 +751,7 @@@ msgstr "M�gsem
msgid "error while asking for the passphrase: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@@ -935,8 -725,6 +934,8 @@@ msgstr "Hiba a jelsz� l�trehoz�sakor: %
msgid "error creating a stream for a pipe: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@@ -1089,7 -845,6 +1088,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1108,7 -860,6 +1107,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1402,7 -1093,6 +1401,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "nem feldolgozott"
@@@ -1585,19 -1237,14 +1584,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "�rja be a jelsz�t: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "titkos kulcs nem �ll rendelkez�sre"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
@@@ -1612,222 -1257,171 +1611,222 @@@ msgstr "Ez a parancs %s m�dban nem enge
msgid "Reset Code not or not anymore available\n"
msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Mit v�laszt? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "Nincs megadva ok."
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "nem feldolgozott"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "preferenci�k friss�t�se"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "megmutatja az ujjlenyomatot"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Kulcsgener�l�s sikertelen: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Milyen kulcsm�retet szeretne? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Milyen kulcsm�retet szeretne? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Milyen kulcsm�retet szeretne? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "Felkerek�tve %u bitre.\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1835,155 -1429,120 +1834,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (csak titkos�t�s)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "�rv�nytelen v�laszt�s.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Val�ban al��rja? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "kil�p�s ebb�l a men�b�l"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "megmutatja ezt a s�g�t"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "Kulcs tal�lhat�: "
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "lej�rat megv�ltoztat�sa"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
@@@ -1991,78 -1549,64 +1990,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, 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:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(Kiv�ve, ha megad egy kulcsot az ujjlenyomat�val.)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban \"--yes\" n�lk�l.\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "T�r�ljem ezt a kulcsot a kulcskarik�r�l? "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Ez egy titkos kulcs! Val�ban t�r�ljem? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "key"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Nyilv�nos kulcs� (pubkey): "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "Kulcstulajdonos megb�zhat�s�gi adatait t�r�ltem.\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@@ -2112,7 -1648,6 +2117,7 @@@ msgstr "A %s (%d) t�m�r�t�s haszn�lata
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:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, 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"
@@@ -2200,290 -1719,243 +2205,310 @@@ msgstr "
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "haszn�lhatatlan titkos kulcs"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: kihagyva: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "FIGYELEM: Semmit sem export�ltam.\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[ismeretlen kulcs]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "�rv�nytelen import opci�k!\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
"--allow-non-selfsigned-uid opci�val.\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "adat titkos�t�sa"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "adat visszafejt�se (alap�rtelmez�s)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "al��r�s ellen�rz�se"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "kulcsok list�z�sa"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "kulcsok �s al��r�sok list�z�sa"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "kulcsal��r�sok ellen�rz�se"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "kulcsok �s ujjlenyomatok list�z�sa"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "titkos kulcsok list�z�sa"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "visszavon�si igazol�s k�sz�t�se"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "kulcs al��r�sa"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "kulcs al��r�sa helyileg"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "kulcs al��r�sa"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "kulcs al��r�sa helyileg"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "kulcs al��r�sa vagy szerkeszt�se"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "kulcsok export�l�sa"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "kulcsok export�l�sa kulcsszerverre"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "kulcsok import�l�sa kulcsszerverr�l"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "kulcsok keres�se kulcsszerveren"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "minden kulcs friss�t�se kulcsszerverr�l"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "kulcsok import�l�sa/�sszef�z�se"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "bizalmi adatb�zis friss�t�se"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|N�V|titkos�t�s N�V r�sz�re"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, 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:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "kanonikus sz�veges m�d haszn�lata"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "ne csin�ljon semmi v�ltoztat�st"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "fel�l�r�s el�tt r�k�rdez�s"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2491,7 -1963,6 +2516,7 @@@ msgstr "
"@\n"
"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2511,13 -1982,11 +2536,13 @@@ msgstr "
" --list-keys [nevek] kulcsok ki�rat�sa\n"
" --fingerprint [nevek] ujjlenyomatok ki�rat�sa\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2532,7 -2001,6 +2557,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:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2540,589 -2008,515 +2565,654 @@@ msgstr "
"\n"
"T�mogatott algoritmusok:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Nyilv�nos kulcs� (pubkey): "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Rejtjelez� (cipher): "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Kivonatol� (hash): "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "T�m�r�t� (compression): "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "Haszn�lat: gpg [opci�k] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, 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:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, 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:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "kulcs tilt�sa"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, 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:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, 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:3134
++#: g10/gpg.c:3502
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �rtelmetlen %s mellett!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [f�jln�v]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [f�jln�v]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [f�jln�v]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [f�jln�v]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [f�jln�v]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [f�jln�v]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [f�jln�v]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key felh-azonos�t�"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key felh-azonos�t�"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key felh-azonos�t� [parancsok]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key felh-azonos�t�"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, 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:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[f�jln�v]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti g�pelni az �zenetet...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
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:4704
++#: g10/gpg.c:5200
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:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3298,7 -2658,6 +3388,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
@@@ -3308,7 -2666,6 +3398,7 @@@
msgid "key %s: %s\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3331,7 -2684,6 +3421,7 @@@ msgstr "%08lX kulcs: Nincs �rv�nyes fel
msgid "this may be caused by a missing self-signature\n"
msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
@@@ -3341,263 -2692,226 +3431,278 @@@
msgid "key %s: new key - skipped\n"
msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "�rok a \"%s\" �llom�nyba.\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, 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:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, 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:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, 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:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
"%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, 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:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, 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:2062
++#: g10/import.c:2104
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, 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:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
@@@ -3624,61 -2934,52 +3729,66 @@@ msgstr "\"%s\" kulcskarik�t l�trehoztam
msgid "keyring '%s' created\n"
msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[visszavon�s]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[�nal��r�s]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 rossz al��r�s.\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d rossz al��r�s.\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3691,63 -2992,53 +3801,68 @@@ msgstr "
"k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = r�szlegesen megb�zom benne\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = teljesen megb�zom benne\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Nem tudom al��rni.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Val�ban al��rja? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3756,11 -3047,9 +3871,11 @@@ msgstr "
"\"%s\" �nal��r�sa\n"
"PGP 2.x st�lus�.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3769,11 -3058,9 +3884,11 @@@ msgstr "
"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
"kulcson lej�rt.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3782,43 -3069,34 +3897,43 @@@ msgstr "
"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
"kulcson helyi al��r�s.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "M�g egyszer al� akarja �rni? (i/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Ez a kulcs lej�rt!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Ez a kulcs lej�r: %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3827,32 -3105,26 +3942,32 @@@ msgstr "
"Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
"a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nem v�laszolok.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Egy�ltal�n nem ellen�riztem.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Nagyon alaposan ellen�riztem.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3861,269 -3133,214 +3976,269 @@@ msgstr "
"Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
"az �n kulcs�val: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ez egy �nal��r�s lesz.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Val�ban al��rja? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "ment�s �s kil�p�s"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Al��r�s-jel�l�s: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "al��r�sok visszavon�sa"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "kulcs helyi al��r�sa"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "fot�azonos�t� hozz�ad�sa"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "felhaszn�l�i azonos�t� t�rl�se"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "m�sodlagos kulcs t�rl�se"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "visszavon� kulcs hozz�ad�sa"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "preferenci�k list�z�sa (szak�rt�)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "preferenci�k list�z�sa (r�szletes)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "felhaszn�l�i azonos�t� visszavon�sa"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "m�sodlagos kulcs visszavon�sa"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "kulcs enged�lyez�se"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "kulcs tilt�sa"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "fot�azonos�t� megmutat�sa"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Titkos kulcs rendelkez�sre �ll.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4131,267 -3348,210 +4246,267 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "A kulcsot visszavont�k."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "ismeretlen al��r�soszt�ly"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Val�ban t�rli ezt a kulcsot? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Val�ban visszavonja ezt a kulcsot? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Val�ban visszavonja ezt a kulcsot? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "preferencialista be�ll�t�sa"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Val�ban friss�tsem a preferenci�kat? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Mentsem a v�ltoztat�sokat? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Kil�pjek ment�s n�lk�l? "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Kivonat: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Jellemz�k: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Jel�l�s: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (�rz�keny)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s nem hozhat� l�tre: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[visszavont] "
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [lej�r: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [lej�r: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " bizalom: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " bizalom: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Ez a kulcs tiltott."
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4399,19 -3559,14 +4514,19 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[visszavont] "
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4419,17 -3574,14 +4534,17 @@@ msgstr "
"FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
" azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4439,79 -3591,62 +4554,79 @@@ msgstr "
"okozhatja,\n"
" hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "T�r�ltem %d al��r�st.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "T�r�ltem %d al��r�st.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Nem t�r�ltem semmit.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
#, fuzzy
msgid "invalid"
msgstr "�rv�nytelen p�nc�l"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4521,196 -3656,161 +4636,203 @@@ msgstr "
" azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
"kulcsot!\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Al��r�s-jel�l�s: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Fel�l�rjam (i/N)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "Felhaszn�l�azonos�t�: \""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " al��rva %08lX �ltal %s%s%s id�pontban.\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (nem export�lhat�)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " al��rva %08lX �ltal %s%s id�pontban.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (nem export�lhat�)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " visszavonva %08lX �ltal %s id�pontban.\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "Nincs titkos kulcs.\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
@@@ -4752,14 -3844,10 +4874,14 @@@ msgstr "�nal��r�st �rok.\n
msgid "writing key binding signature\n"
msgstr "�sszef�z� al��r�st �rok.\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
@@@ -5057,41 -4096,36 +5179,46 @@@ msgstr "
msgid "Real name: "
msgstr "Teljes n�v: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "�rv�nytelen karakter a n�vben!\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "E-mail c�m: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Ez nem �rv�nyes e-mail c�m.\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Megjegyz�s: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5102,7 -4136,6 +5229,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
@@@ -5117,37 -4150,30 +5244,37 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnMmEeRrKk"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr ""
"(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5155,23 -4181,19 +5282,23 @@@ msgstr "
"Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5183,7 -4205,6 +5310,7 @@@ msgstr "
"az \"--edit-key\" opci�val.\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5195,12 -4216,10 +5322,12 @@@ msgstr "
"a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
"gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgener�l�s sikertelen: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5208,58 -4227,47 +5335,58 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" m�r t�m�r�tett.\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "M�gis l�trehozzam? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "M�gis l�trehozzam? "
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "�rom a kulcsot a %s �llom�nyba.\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5269,264 -4277,210 +5396,264 @@@ msgstr "
"k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
"teheti meg.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Val�ban l�trehozzam? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "soha "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritikus al��r�si elj�r�sm�d: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Al��r�si elj�r�sm�d: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritikus al��r�s-jel�l�s: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Al��r�s-jel�l�s: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 rossz al��r�s.\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d rossz al��r�s.\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Kulcskarika"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Els�dlegeskulcs-ujjlenyomat:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr "Els�dlegeskulcs-ujjlenyomat:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " Kulcs ujjlenyomata ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: Kulcskarik�t l�trehoztam.\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr ""
"FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr ""
@@@ -5561,7 -4509,6 +5688,7 @@@ msgstr "Nyilv�nos kulccsal titkos�tott
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " azaz \""
@@@ -5609,261 -4547,209 +5736,261 @@@ msgstr "Visszafejt�s rendben.\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Eredeti f�jln�v: '%.*s'.\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"K�l�n�ll� visszavon�s. Haszn�lja a \"gpg --import\"-ot az alkalmaz�s�hoz!\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "J� al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "J� al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, 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:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " azaz \""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
- #: g10/mainproc.c:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Kulcs tal�lhat�: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[bizonytalan]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " azaz \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Az al��r�s lej�r: %s.\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "Bin�ris"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "Sz�vegm�d�"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "Ismeretlen m�d�"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "Nem k�l�n�ll� al��r�s.\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, 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:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
"a c�mzett preferenci�ival.\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "nem megval�s�tott rejtjelez� algoritmus"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
"a c�mzett preferenci�ival.\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: Elavult opci�: \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "t�m�r�tetlen"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "t�m�r�tetlen"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "ismeretlen al��r�soszt�ly"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6062,31 -4915,24 +6189,31 @@@ msgstr "Ez a fot� megfelel� (i/N/k)?
msgid "unable to display photo ID!\n"
msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Nincs megadva ok."
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "A kulcsot lecser�lt�k."
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "A kulcs kompromitt�l�dott."
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "A kulcs m�r nem haszn�latos."
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "Visszavon�s oka: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "Megjegyz�s a visszavon�shoz: "
@@@ -6100,100 -4946,81 +6227,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iIfFkKhH"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Nincs megb�zhat�s�gi �rt�k rendelve:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " azaz \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Nem tudom\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NEM b�zom benne\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = alapvet�en megb�zom benne\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " f = visszat�r�s a f�men�be\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " h = kulcs kihagy�sa\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " k = kil�p�s\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Mit v�laszt? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "T�nyleg be akarja �ll�tani ezt a kulcsot alapvet�en megb�zhat�ra? "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Alapvet�en megb�zhat� kulcshoz vezet� igazol�sok:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Ez a kulcs hozz�nk tartozik.\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6205,115 -5032,90 +6332,115 @@@ msgstr "
"a k�vetkez� k�rd�sre v�laszolhat igennel.\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "M�gis haszn�ljuk ezt a kulcsot? "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
#, 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:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Az al��r�s val�sz�n�leg HAMIS.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: kihagyva: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6321,77 -5123,60 +6448,77 @@@ msgstr "
"\n"
"Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "Nincsenek �rv�nyes c�mzettek!\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, 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:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "K�l�n�ll� al��r�s.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "Olvasom a szabv�nyos bemenetet...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "Nincs al��rt adat.\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
@@@ -6430,8 -5208,6 +6557,8 @@@ msgstr "MEGJEGYZ�S: %08lX titkos kulcs
msgid "Note: key has been revoked"
msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet sikertelen: %s.\n"
@@@ -6441,43 -5216,39 +6568,49 @@@
msgid "key %s has no user IDs\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Visszavonja:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Titkos kulcs rendelkez�sre �ll.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet sikertelen: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Visszavon� igazol�s l�trehozva.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6485,19 -5256,27 +6618,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6515,33 -5294,26 +6661,33 @@@ msgstr "
"adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
"rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "M�gsem"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Visszavon�s oka: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Nincs le�r�s.)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Ez �gy rendben van? "
@@@ -6567,72 -5335,59 +6713,72 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "FIGYELEM: Al��r�skivonat-konfliktus az �zenetben.\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = tov�bbi inform�ci�kat k�rek\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "FIGYELEM: %08lX al��r� alkulcson �rv�nytelen kereszthiteles�t�s van.\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "MEGJEGYZ�S: Al��r� kulcs (%08lX) lej�rt: %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"Rossz al��r�st felt�telezek a %08lX kulcst�l egy ismeretlen\n"
"kritikus bit miatt.\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
@@@ -6680,34 -5429,28 +6826,34 @@@ msgstr "
msgid "signing:"
msgstr "Al��rom:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s titkos�t�st fogok haszn�lni.\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"A kulcs nincs \"nem biztons�gosnak\" jel�lve,\n"
"nem tudom a p�tl� v�letlensz�m-gener�torral haszn�lni!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"Kihagytam \"%s\"-t: ez egy PGP �ltal l�trehozott ElGamal kulcs, amely nem\n"
"biztons�gos al��r�sokhoz!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
@@@ -6755,7 -5490,6 +6901,7 @@@ msgstr "Hiba bizalmi rekord keres�sekor
msgid "read error in '%s': %s\n"
msgstr "Olvas�si hiba: %s.\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
@@@ -6784,7 -5513,6 +6930,7 @@@ msgstr "Bizalmi adatb�zis %lu. rekord:
msgid "trustdb transaction too large\n"
msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
@@@ -6901,119 -5606,95 +7047,119 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "\"%s\" nem egy �rv�nyes hossz� kulcsazonos�t�.\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "%08lX kulcs: Elfogadva megb�zhat� kulcsk�nt.\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "A(z) %08lX kulcs egyn�l t�bbsz�r szerepel a bizalmi adatb�zisban.\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"%08lX kulcs: Nincs nyilv�nos kulcs a megb�zhat� kulcshoz - kihagytam.\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "A kulcsot alapvet�en megb�zhat�nak jel�ltem.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "%lu bizalmi rekord, %d k�r�st�pus: olvas�s sikertelen: %s.\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
@@@ -7250,11 -5882,9 +7396,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7395,12 -5997,10 +7541,12 @@@ msgstr "%s al��r�s, %s kivonatol� algor
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@@ -7421,7 -6018,6 +7567,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7481,12 -6065,10 +7627,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7919,7 -6409,6 +8065,7 @@@ msgstr "Hiba a(z) \"%s\" kulcskarika l�
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "Kulcsgener�l�s sikertelen: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8517,7 -6886,6 +8663,7 @@@ msgstr "rossz igazol�s
msgid " runtime cached certificates: %u\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "Visszavon� igazol�s l�trehozva.\n"
@@@ -8527,8 -6894,6 +8673,8 @@@
msgid "certificate cached\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@@ -8590,7 -6944,6 +8736,7 @@@ msgstr "A kulcsblokk t�rl�se sikertelen
msgid "not removing file '%s'\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@@ -8814,220 -7123,177 +8960,220 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet sikertelen: %s.\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "�rok a \"%s\" �llom�nyba.\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "visszavon�si igazol�s k�sz�t�se"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "�rok a \"%s\" �llom�nyba.\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
@@@ -9073,75 -7329,59 +9219,75 @@@ msgstr "Hiba \"%s\" l�trehoz�sakor: %s\
msgid "error retrieving '%s': http status %u\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "Visszavon� igazol�s l�trehozva.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "rossz igazol�s"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "rossz igazol�s"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "rossz igazol�s"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "rossz igazol�s"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9149,226 -7389,155 +9295,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"T�mogatott algoritmusok:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "Kil�pjek ment�s n�lk�l? "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9381,91 -7550,72 +9500,91 @@@ msgstr "
"@\n"
"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "Haszn�lat: gpg [opci�k] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "A sor t�l hossz�!\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "Olvas�si hiba: %s.\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "nem feldolgozott"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9716,12 -7815,10 +9835,12 @@@ msgstr "Keresem \"%s\"-t a %s HKP szerv
msgid "malloc failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9756,11 -7847,10 +9875,12 @@@ msgstr "Hiba \"%s\" olvas�sakor: %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9908,72 -7968,61 +10028,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, 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:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10230,11 -8219,9 +10355,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/id.gmo
index 075149a,0000000..2469a29
mode 100644,000000..100644
Binary files differ
diff --cc po/id.po
index 774804c,2632e69..4506f05
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
"Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@@ -72,7 -61,6 +72,7 @@@ msgstr "passphrase tidak valid
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -82,75 -70,59 +82,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase yang buruk"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "baris terlalu panjang\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "passphrase terlalu panjang\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Karakter tidak valid dalam nama\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "MPI yang buruk"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "passphrase yang buruk"
@@@ -160,25 -131,11 +160,25 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -251,11 -195,9 +251,11 @@@ msgstr "Silakan masukkan passphrase; in
msgid "failed to create stream from socket: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -398,42 -314,28 +398,42 @@@ msgstr "
"Pilihan:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detil"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "lebih diam"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -518,11 -403,6 +518,11 @@@ msgstr "tidak didukung
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -538,145 -416,107 +538,144 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: direktori tercipta\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: tidak dapat membuat direktori: %s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "gagal perbarui rahasia: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@@ -692,8 -530,6 +691,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -537,6 +700,9 @@@ msgstr "
"@Perintah:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -757,7 -582,6 +756,7 @@@ msgstr "Batal
msgid "error while asking for the passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -940,8 -730,6 +939,8 @@@ msgstr "kesalahan penciptaan passphrase
msgid "error creating a stream for a pipe: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -1094,7 -850,6 +1093,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1113,7 -865,6 +1112,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1407,7 -1098,6 +1406,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "tidak diproses"
@@@ -1591,19 -1243,14 +1590,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "Masukkan passphrase: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "kunci rahasia tidak tersedia"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@@ -1618,222 -1263,171 +1617,222 @@@ msgstr "Perintah ini tidak dibolehkan s
msgid "Reset Code not or not anymore available\n"
msgstr "bagian kunci rahasia tidak tersedia\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Pilihan anda? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "Tidak ada alasan diberikan"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "tidak diproses"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "tidak ada kunci publik yang sesuai: %s\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "perbarui preferensi"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "tampilkan fingerprint"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1841,155 -1435,120 +1840,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Pilihan tidak valid.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Silakan pilih alasan untuk pembatalan:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Ditandai? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "berhenti dari menu ini"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "tampilkan bantuan"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "Kunci tersedia di:"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "ubah tanggal kadaluarsa"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "ubah ownertrust"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "buat sepasang kunci baru"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Perintah tidak valid (coba \"help\")\n"
@@@ -1997,78 -1555,64 +1996,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output tidak berfungsi untuk perintah ini\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "tidak dapat membuka `%s'\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "gagal membaca keyblock: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "kunci '%s' tidak ditemukan: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(kecuali anda menspesifikasikan kunci dengan fingerprint)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Menghapus kunci ini dari keyring? "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "kunci"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Pubkey: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "informasi ownertrust dihapus\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -2118,7 -1654,6 +2123,7 @@@ msgstr "memaksa algoritma kompresi %s (
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
@@@ -2205,288 -1724,241 +2210,308 @@@ msgstr "PERINGATAN: tidak dapat menghap
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "kunci rahasia tidak dapat dipakai"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: dilewati: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "PERINGATAN: tidak ada yang diekspor\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[User id tidak ditemukan]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "opsi impor tidak valid\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "buat detached signature"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|buat signature teks"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "buat detached signature"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "enkripsi data"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "verifikasi signature"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "tampilkan kunci"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "tampilkan kunci dan signature"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "periksa signature kunci"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "hapus kunci dari keyring publik"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "hapus kunci dari keyring pribadi"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "ubah passphrase"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "ekspor kunci"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "ekspor kunci ke key server"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "impor kunci dari key server"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "cari kunci di key server"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "update semua kunci dari keyserver"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "impor/gabung kunci"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "perbarui database trust"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [file]|cetak digest pesan"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAMA|enkripsi untuk NAMA"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "jangan buat perubahan"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "tanya sebelum menimpa"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2494,7 -1966,6 +2519,7 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2514,13 -1985,11 +2539,13 @@@ msgstr "
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2535,7 -2004,6 +2560,7 @@@ msgstr "
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2543,591 -2011,517 +2568,656 @@@ msgstr "
"\n"
"Algoritma yang didukung:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Kompresi: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pemakaian: gpg [pilihan] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "tampilkan keyring tempat kunci yang dipilih berada"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "tiadakan kunci"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "penerima baku tidak dikenal `%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "penerima baku tidak dikenal `%s'\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "kesalahan menulis keyring `%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth harus di antara 1 hingga 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "algoritma hash tidak valid `%s'\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "algoritma hash tidak valid `%s'\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [namafile]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [namafile]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [namafile]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-user"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, 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:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "kesalahan penciptaan passphrase: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[namafile]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "mengambil kunci ini dari keyring"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "buat timestamp konflik hanya sebagai peringatan"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|tulis info status ke FD ini"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3303,7 -2663,6 +3393,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "kunci %08lX: tidak ada ID user\n"
@@@ -3313,7 -2671,6 +3403,7 @@@
msgid "key %s: %s\n"
msgstr "melewati `%s': %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3336,7 -2689,6 +3426,7 @@@ msgstr "kunci %08lX: tidak ada ID user
msgid "this may be caused by a missing self-signature\n"
msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
@@@ -3346,260 -2697,223 +3436,275 @@@
msgid "key %s: new key - skipped\n"
msgstr "kunci %08lX: kunci baru - dilewati\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "menulis ke `%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "kunci %08lX: \"%s\" tidak berubah\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "kunci %08lX: kunci rahasia diimpor\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "kunci %08lX: subkey binding tidak valid\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "kunci %08lX: hapus subkey binding ganda\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kunci %08lX: melewati ID user "
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "kunci %08lX: melewati subkey\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
@@@ -3626,61 -2936,52 +3731,66 @@@ msgstr "%s: keyring tercipta\n
msgid "keyring '%s' created\n"
msgstr "%s: keyring tercipta\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "kesalahan membaca `%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[pembatalan]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[self-signature]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 signature yang buruk\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d signature yang buruk\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 signature tidak diperiksa karena kesalahan\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3693,63 -2994,53 +3803,68 @@@ msgstr "
"memeriksa fingerprint dari berbagai sumber...)?\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Saya cukup percaya\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Saya sangat percaya\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr "..Tidak dapat menandai.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User ID \"%s\" kadaluwarsa."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID \"%s\" bukan self-signed."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "User ID \"%s\" bukan self-signed."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Ditandai? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3758,11 -3049,9 +3873,11 @@@ msgstr "
"Self-signature pada \"%s\"\n"
"adalah signature bergaya PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3771,13 -3060,11 +3886,13 @@@ msgstr "
"Signature anda saat ini pada \"%s\"\n"
"telah habis berlaku.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
"berlaku? (y/N)"
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3786,43 -3073,34 +3901,43 @@@ msgstr "
"Signature anda saat ini pada \"%s\"\n"
"adalah signature.lokal \n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Apakah anda ingin menandainya lagi? (y/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Kunci ini telah berakhir!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3832,32 -3110,26 +3947,32 @@@ msgstr "
"menandai benar benar milik\n"
"orang tersebut? Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Saya tidak akan menjawab.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Saya belum memeriksanya.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Saya telah melakukan pemeriksaan biasa.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3866,269 -3138,214 +3981,269 @@@ msgstr "
"Apakah anda yakin untuk menandai kunci ini \n"
"dengan kunci anda: "
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ini akan jadi self-signature.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat diekspor.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Saya belum memeriksa kunci ini sama sekali.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Saya telah memeriksa kunci ini.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Ditandai? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "memindahkan signature kunci ke tempat yang tepat\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "simpan dan berhenti"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Notasi signature: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "tampilkan kunci dan ID user"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "pilih ID user N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "pilih ID user N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "batalkan signature"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "tandai kunci secara lokal"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "tambah sebuah ID user"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "tambah sebuah photo ID"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "hapus ID user"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "hapus kunci sekunder"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "tambah kunci pembatalan"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "tandai ID user sebagai primer"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "tampilkan preferensi (ahli)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "tampilkan preferensi (verbose)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "ubah passphrase"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "ubah ownertrust"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Benar-benar hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "batalkan sebuah ID user"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "batalkan kunci sekunder"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "aktifkan kunci"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "tiadakan kunci"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "tampilkan photo ID"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Kunci rahasia tersedia.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4136,267 -3353,210 +4251,267 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Kunci dibatalkan"
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Tandai ID seluruh user? "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Tandai ID seluruh user? "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "kelas signature tidak dikenal"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Hapus ID user ini? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Hapus ID user ini? "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Anda ingin menghapus kunci ini? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Benar-benar hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Benar-benar hapus ID user ini? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Anda ingin membatalkan kunci ini? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Anda ingin membatalkan kunci terpilih ini? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Anda ingin membatalkan kunci ini? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "set daftar preferensi"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Update preferensi?"
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Simpan perubahan? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Berhenti tanpa menyimpan? "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Tidak ada ID user tersebut.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Fitur: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Notasi: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (sensitive)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revoked] "
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [berakhir: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [berakhir: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " trust: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " trust: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Kunci ini telah ditiadakan"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4404,19 -3564,14 +4519,19 @@@ msgstr "
"Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
"kecuali anda memulai kembali program.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revoked] "
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4424,17 -3579,14 +4539,17 @@@ msgstr "
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4444,79 -3596,62 +4559,79 @@@ msgstr "
"dapat menyebabkan beberapa versi\n"
" PGP menolak kunci ini.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Anda tetap ingin menambahkannya? (y/n) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Hapus signature baik ini? (y/T/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Hapus signature tidak valid ini? (y/T/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Menghapus %d signature.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Menghapus %d signature.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Tidak ada yang dihapus.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
#, fuzzy
msgid "invalid"
msgstr "armor tidak valid"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4526,199 -3661,165 +4641,207 @@@ msgstr "
"designated dapat\n"
"............menyebabkan beberapa versi PGP menolak kunci ini.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
"sendiri\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
"dilakukan\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Merubah batas waktu untuk kunci sekunder.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Merubah batas waktu untuk kunci primer.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "melewati self-signature v3 pada user id \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Notasi signature: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ditimpa (y/T)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Tidak ada ID user dengan index %d\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID user: "
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " ditandai oleh %08lX pada %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (tidak dapat diekspor)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Anda tetap ingin membatalkannya? (y/n) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " ditandai oleh %08lX pada %s%s\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Anda telah menandai ID user ini:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (tidak dapat diekspor)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " dibatalkan oleh %08lX pada %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Anda akan membatalkan signature ini:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "tidak ada kunci rahasia\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
@@@ -4760,14 -3853,10 +4883,14 @@@ msgstr "menulis self signature\n
msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize tidak valid; menggunakan %u bit\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize dibulatkan hingga %u bit\n"
@@@ -5064,41 -4104,36 +5187,46 @@@ msgstr "
msgid "Real name: "
msgstr "Nama sebenarnya: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Alamat email: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Komentar: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Anda menggunakan set karakter `%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5108,7 -4143,6 +5236,7 @@@ msgstr "
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
@@@ -5123,35 -4157,28 +5251,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Silakan perbaiki kesalahan ini dulu\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5159,23 -4186,19 +5287,23 @@@ msgstr "
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5188,7 -4211,6 +5316,7 @@@ msgstr "
"menggunakan program ini dengan pilihan \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5200,12 -4222,10 +5328,12 @@@ msgstr "
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5213,58 -4233,47 +5341,58 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' sudah dikompresi\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Tetap dibuat? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Tetap dibuat? "
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "menulis kunci publik ke `%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "kesalahan menulis keyring publik `%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5274,262 -4283,208 +5402,262 @@@ msgstr "
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ingin diciptakan? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "tidak pernah..."
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kebijakan signature kritis: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Kebijakan signature: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notasi signature kritis: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notasi signature: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 signature yang buruk\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d signature yang buruk\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Keyring"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "melewati `%s': %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Fingerprint kunci primer:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Fingerprint kunci primer ="
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint kunci ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "memeriksa keyring `%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu kunci telah diperiksa (%lu signature)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu kunci telah diperiksa (%lu signature)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: keyring tercipta\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"ditandai dengan kunci anda %08lX pada %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
@@@ -5563,7 -4512,6 +5691,7 @@@ msgstr "data terenkripsi dengan kunci p
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
@@@ -5609,257 -4548,205 +5737,257 @@@ msgstr "dekripsi lancar\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "original file name='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "signature BURUK dari \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature kadaluarsa dari \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "verifikasi signature tidak diabaikan\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "tidak dapat menangani banyak signature ini\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Kunci tersedia di:"
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[uncertain]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Signature kadaluarsa pada %s \n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "biner"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "modeteks"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "tidak dikenal"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritma pubkey tidak dikenal"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Tidak dapat memeriksa signature: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "bukan detached signature\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "kelas signature mandiri 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "signature model lama (PGP 2.X)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "tidak dapat membuka file: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "tidak dapat menangani algoritma kunci publik %d\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "algoritma cipher belum diimplementasikan"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s signature, algoritma digest %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "silakan gunakan \"%s%s\"\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Tidak dikompresi"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "Tidak dikompresi"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "membaca pilihan dari `%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "kelas signature tidak dikenal"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6054,31 -4908,24 +6182,31 @@@ msgstr "Apakah foto ini benar (y/N/q)?
msgid "unable to display photo ID!\n"
msgstr "tidak dapat menampilkan photo ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Tidak ada alasan diberikan"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Kunci dilampaui"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Kunci ini telah dikompromikan"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Kunci tidak lagi digunakan"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "ID User tidak lagi valid"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "Alasan pembatalan:"
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "Komentar pembatalan:"
@@@ -6092,100 -4939,81 +6220,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Tidak ada nilai trust untuk:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alias \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "Kunci ini mungkin milik pemiliknya\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Tidak tahu\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d: Saya TIDAK percaya\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Saya sangat percaya sekali\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = kembali ke menu utama\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = lewati kunci ini\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " q = berhenti\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Keputusan anda? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Anda ingin menset kunci ini menjadi sangat percaya sekali?"
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Kunci ini mungkin milik pemiliknya\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Kunci ini milik kita\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6197,115 -5025,90 +6325,115 @@@ msgstr "
"pertanyaan berikut dengan ya\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Tetap gunakan kunci ini? "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Hal ini dapat berarti bahwa signature adalah palsu.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Catatan: Kunci ini telah ditiadakan\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Catatan: Kunci ini telah berakhir!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Tidak ada indikasi signature milik pemilik.\n"
- #: g10/pkclist.c:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Signature mungkin palsu.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Tidak pasti signature milik pemilik.\n"
- #: g10/pkclist.c:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: dilewati: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: dilewati: kunci publik dimatikan\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: dilewati: kunci publik telah ada\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6313,75 -5116,58 +6441,75 @@@ msgstr "
"\n"
"Masukkan user ID. Akhiri dengan baris kosong: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Tidak ada ID user tersebut.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Kunci publik dimatikan.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "dilewati: kunci publik telah diset\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "tidak ada alamat yang valid\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Menghapus signature.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Silakan masukkan nama file data: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "membaca stdin ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "tidak ada data tertandai\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "tidak dapat membuka data tertandai `%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "tidak dapat membuka data tertandai `%s'\n"
@@@ -6420,8 -5199,6 +6548,8 @@@ msgstr "CATATAN: kunci pribadi %08lX be
msgid "Note: key has been revoked"
msgstr "CATATAN: kunci telah dibatalkan"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet gagal: %s\n"
@@@ -6431,43 -5207,39 +6559,49 @@@
msgid "key %s has no user IDs\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Akan dibatalkan oleh:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Ini adalah kunci pembatalan sensitif)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Kunci rahasia tersedia.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Buat sertifikat pembatalan untuk kunci ini?"
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "Pemaksaan output mode ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "gagal make_keysig_packet: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Sertifikat pembatalan tercipta.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Buat sertifikat pembatalan untuk kunci ini?"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6475,19 -5247,27 +6609,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Buat sertifikat pembatalan untuk kunci ini?"
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6507,34 -5287,27 +6654,34 @@@ msgstr "
"pencetakan\n"
"mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Silakan pilih alasan untuk pembatalan:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Batal"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Mungkin anda ingin memilih %d di sini)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Alasan pembatalan: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Tidak diberikan deskripsi)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Ini oke? "
@@@ -6559,74 -5328,61 +6706,74 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "Peringatan: konflik digest signature dalam pesan\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = beri saya informasi lebih banyak lagi\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
"tidak valid\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "CATATAN: kunci telah dibatalkan"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
"dikenal\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
@@@ -6670,34 -5420,28 +6817,34 @@@ msgstr "memaksa algoritma digest %s (%d
msgid "signing:"
msgstr "menandai:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s enkripsi akan digunakan\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
"palsu!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "lewati `%s': terduplikasi\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
"untuk signature!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@@ -6745,7 -5481,6 +6892,7 @@@ msgstr "kesalahan: gagal menemukan cata
msgid "read error in '%s': %s\n"
msgstr "kesalahan pembacaan: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: gagal sync: %s\n"
@@@ -6774,7 -5504,6 +6921,7 @@@ msgstr "trustdb rec %lu: write failed (
msgid "trustdb transaction too large\n"
msgstr "transaksi trustdb terlalu besar\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
@@@ -6891,118 -5597,94 +7038,118 @@@ msgstr "tidak dapat menangani baris tek
msgid "input line longer than %d characters\n"
msgstr "baris input lebih dari %d karakter\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s' bukanlah keyID panjang yang valid\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "kunci ditandai sebagai sangat dipercaya.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "tidak perlu memeriksa trustdb\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "pemeriksaan trustdb berikutnya pada %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "tidak perlu memeriksa trustdb\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "tidak perlu memeriksa trustdb\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "kunci publik %08lX tidak ditemukan: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "lakukanlah --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "memeriksa trustdb\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@@ -7239,11 -5872,9 +7386,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7384,12 -5987,10 +7531,12 @@@ msgstr "%s signature, algoritma digest
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@@ -7410,7 -6008,6 +7557,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7470,12 -6055,10 +7617,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7907,7 -6398,6 +8054,7 @@@ msgstr "kesalahan menulis keyring `%s'
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "Pembuatan kunci gagal: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8506,7 -6876,6 +8653,7 @@@ msgstr "sertifikat yang buruk
msgid " runtime cached certificates: %u\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "Sertifikat pembatalan tercipta.\n"
@@@ -8516,8 -6884,6 +8663,8 @@@
msgid "certificate cached\n"
msgstr "preferensi %c%lu ganda \n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -8579,7 -6934,6 +8726,7 @@@ msgstr "gagal menghapus keyblok: %s\n
msgid "not removing file '%s'\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -8803,220 -7113,177 +8950,220 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "respon tidak valid dari agen\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "tidak dapat membuka file: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet gagal: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "menulis ke `%s'\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "buat sertifikat revokasi"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "verifikasi signature tidak diabaikan\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "tidak dapat membuat direktori `%s': %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "tidak dapat membuat direktori `%s': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "gagal perbarui rahasia: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "menulis ke `%s'\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: kesalahan membaca record bebas: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? masalah memeriksa pembatalan: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
@@@ -9062,75 -7319,59 +9209,75 @@@ msgstr "kesalahan penciptaan : `%s': %s
msgid "error retrieving '%s': http status %u\n"
msgstr "kesalahan membaca `%s': %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "Sertifikat pembatalan tercipta.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "sertifikat yang buruk"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "sertifikat yang buruk"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "sertifikat yang buruk"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "sertifikat yang buruk"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9138,226 -7379,155 +9285,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "tidak dapat terkoneksi ke `%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "preferensi %c%lu ganda \n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "CATATAN: kunci telah dibatalkan"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "tidak dapat melakukan statistik `%s': %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: gagal membuat hashtable: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "protokol gpg-agent versi %d tidak didukung\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "tidak dapat terkoneksi ke `%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritma yang didukung:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|muat modul ekstensi FILE"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "Berhenti tanpa menyimpan? "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9370,91 -7540,72 +9490,91 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "pemakaian: gpg [pilihan] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "baris terlalu panjang\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "kesalahan pembacaan: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "tidak diproses"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9705,12 -7805,10 +9825,12 @@@ msgstr "mencari \"%s\" dari server HKP
msgid "malloc failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9745,11 -7837,10 +9865,12 @@@ msgstr "kesalahan membaca `%s': %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "kunci '%s' tidak ditemukan: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9897,72 -7958,61 +10018,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s: gagal membuat hashtable: %s\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10219,11 -8209,9 +10345,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/it.gmo
index f0bfc11,0000000..918c6c1
mode 100644,000000..100644
Binary files differ
diff --cc po/it.po
index 6c94b2f,bde95bb..4eb52b9
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2008-05-26 12:02+0200\n"
"Last-Translator: Marco d'Itri <md at linux.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "passphrase non valida
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -77,75 -65,59 +77,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase errata"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "riga troppo lunga\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "passphrase troppo lunga\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Carattere non valido nel nome\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "MPI danneggiato"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "passphrase errata"
@@@ -155,25 -126,11 +155,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -246,11 -190,9 +246,11 @@@ msgstr "Inserisci la passphrase, cio� u
msgid "failed to create stream from socket: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -393,42 -309,28 +393,42 @@@ msgstr "
"Opzioni:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolisso"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "meno prolisso"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -513,11 -398,6 +513,11 @@@ msgstr "non gestito
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -533,145 -411,107 +533,144 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossibile creare %s: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directory creata\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: impossibile creare la directory: %s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non � disponibile in questa sessione\n"
@@@ -687,8 -525,6 +686,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -696,9 -532,6 +695,9 @@@ msgstr "
"@Comandi:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -752,7 -577,6 +751,7 @@@ msgstr "Cancella
msgid "error while asking for the passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -935,8 -725,6 +934,8 @@@ msgstr "errore nella creazione della pa
msgid "error creating a stream for a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -1089,7 -845,6 +1088,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1108,7 -860,6 +1107,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1404,7 -1095,6 +1403,7 @@@ msgid "command \"%.50s\" is ambiguous\n
msgstr ""
# ??? (Md)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "non esaminato"
@@@ -1588,19 -1240,14 +1587,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "Inserisci la passphrase: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "la chiave segreta non � disponibile"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossibile fare questo in modo batch\n"
@@@ -1615,223 -1260,172 +1614,223 @@@ msgstr "Questo comando non � permesso i
msgid "Reset Code not or not anymore available\n"
msgstr "parti della chiave segreta non sono disponibili\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Cosa scegli? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "abilita"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "abilita"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "Nessuna ragione specificata"
# ??? (Md)
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "non esaminato"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "non c'� una chiave pubblica corrispondente: %s\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "preferenze aggiornate"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "mostra le impronte digitali"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "saltata: chiave pubblica gi� presente\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1839,155 -1433,120 +1838,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Firma scaduta il %s\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Scelta non valida.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Per favore scegli il motivo della revoca:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Questo comando non � permesso in modalit� %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "saltata: chiave pubblica gi� presente\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Firmo davvero? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "abbandona questo men�"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "mostra questo aiuto"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "Chiave disponibile presso: "
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "cambia la data di scadenza"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "cambia il valore di fiducia"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "genera una nuova coppia di chiavi"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
@@@ -1995,78 -1553,64 +1994,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output non funziona con questo comando\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "impossibile aprire `%s'\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "errore leggendo il keyblock: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "chiave `%s' non trovata: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Vuoi cancellare questa chiave dal portachiavi? "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "key"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "A chiave pubblica: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "informazioni di fiducia del possessore cancellate\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@@ -2123,7 -1659,6 +2128,7 @@@ msgstr "
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "non � possibile usare %s in modalit� %s\n"
@@@ -2212,288 -1731,241 +2217,308 @@@ msgstr "ATTENZIONE: impossibile cancell
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"La firma sar� marcata come irrevocabile.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "non sono state trovate chiavi di revoca per `%s'\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "chiave segreta inutilizzabile"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: saltata: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "ATTENZIONE: non � stato esportato nulla\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[User ID non trovato]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "chiave segreta `%s' non trovata: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "opzioni di importazione non valide\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NOME|usa NOME come chiave segreta predefinita"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "cifra dati"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "elenca le chiavi"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "rimuove le chiavi dal portachiavi privato"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "cambia la passphrase"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "esporta delle chiavi"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "esporta le chiavi a un key server"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importa le chiavi da un key server"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "cerca delle chiavi su un key server"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "aggiorna tutte le chiavi da un key server"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifra per NOME"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "non fa cambiamenti"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "chiede prima di sovrascrivere"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2501,7 -1973,6 +2526,7 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2521,13 -1992,11 +2546,13 @@@ msgstr "
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2542,7 -2011,6 +2567,7 @@@ msgstr "
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2550,590 -2018,516 +2575,655 @@@ msgstr "
"\n"
"Algoritmi gestiti:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "A chiave pubblica: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Cifrari: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Compressione: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opzioni] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "disabilita una chiave"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "destinatario predefinito `%s' sconosciuto\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "destinatario predefinito `%s' sconosciuto\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "errore creando il portachiavi `%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: %s normalmente non deve essere usato!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non � permesso usare %s con %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve essere tra 1 e 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "algoritmo di hash non valido `%s'\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "algoritmo di hash non valido `%s'\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [nomefile]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nomefile]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [comandi]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel keyserver fallita: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento del keyserver fallito: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, 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:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "errore nella creazione della passhprase: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[nomefile]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non � valido\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "prende le chiavi da questo portachiavi"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "segnala i conflitti di data solo con un avvertimento"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato sul FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3309,7 -2669,6 +3399,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chiave %08lX: nessun user ID\n"
@@@ -3319,7 -2677,6 +3409,7 @@@
msgid "key %s: %s\n"
msgstr "saltata `%s': %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3342,7 -2695,6 +3432,7 @@@ msgstr "chiave %08lX: nessun user ID va
msgid "this may be caused by a missing self-signature\n"
msgstr "questo pu� essere causato da una autofirma mancante\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
@@@ -3352,263 -2703,226 +3442,278 @@@
msgid "key %s: new key - skipped\n"
msgstr "chiave %08lX: nuova chiave - saltata\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "scrittura in `%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chiave %08lX: \"%s\" una nuova firma\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chiave %08lX: \"%s\" non cambiata\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chiave %08lX: chiave segreta importata\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chiave %08lX: revoca della subchiave non valida\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chiave %08lX: saltato l'user ID '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chiave %08lX: saltata la subchiave\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
@@@ -3635,61 -2945,52 +3740,66 @@@ msgstr "portachiavi `%s' creato\n
msgid "keyring '%s' created\n"
msgstr "portachiavi `%s' creato\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "errore leggendo `%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "rebuild della cache del portachiavi fallito: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[revoca]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[autofirma]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "una firma non corretta\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d firme non corrette\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "una firma non controllata per mancanza della chiave\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d firme non controllate per mancanza delle chiavi\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "una firma non controllata a causa di un errore\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d firme non controllate a causa di errori\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "Trovato un user ID senza autofirma valida\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "Trovati %d user ID senza autofirme valide\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3702,63 -3003,53 +3812,68 @@@ msgstr "
"impronte digitali da diverse fonti...)?\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Mi fido marginalmente\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Mi fido completamente\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'user ID \"%s\" � stato revocato."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Impossibile firmarla.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'user ID \"%s\" � scaduto."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'user ID \"%s\" non � autofirmato."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'user ID \"%s\" non � autofirmato."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Firmo davvero? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3767,11 -3058,9 +3882,11 @@@ msgstr "
"L'autofirma su \"%s\"\n"
"� una firma in stile PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3780,11 -3069,9 +3895,11 @@@ msgstr "
"La tua firma attuale su \"%s\"\n"
"� scaduta\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3793,43 -3080,34 +3908,43 @@@ msgstr "
"La tua firma attuale su \"%s\"\n"
"� una firma locale.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Niente da firmare con la chiave %08lX\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Questa chiave � scaduta!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Questa chiave scadr� il %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3839,32 -3117,26 +3954,32 @@@ msgstr "
"appartiene veramente alla persona indicata sopra?\n"
"Se non sai cosa rispondere digita \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Preferisco non rispondere.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Non l'ho controllata per niente.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) L'ho controllata superficialmente.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) L'ho controllata molto attentamente.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3873,269 -3145,214 +3988,269 @@@ msgstr "
"Sei davvero sicuro di volere firmare questa chiave\n"
"con la tua chiave: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Questa sar� una autofirma.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La firma sar� marcata come non esportabile.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La firma sar� marcata come irrevocabile.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Non ho controllato per niente questa chiave.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Ho controllato questa chiave superficialmente.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Ho controllato questa chiave molto attentamente.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Firmo davvero? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "spostamento della firma di una chiave nel posto corretto\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "salva ed esci"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Annotazione della firma: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "elenca le chiavi e gli user ID"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "scegli l'user ID N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "scegli l'user ID N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "revoca firme"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "firma la chiave localmente"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "aggiungi un user ID"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "aggiungi un ID fotografico"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "cancella un user ID"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "cancella una chiave secondaria"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "aggiungi una chiave di revoca"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "imposta l'user ID come primario"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "elenca le preferenze (per esperti)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "elenca le preferenze (prolisso)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "cambia la passphrase"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "cambia il valore di fiducia"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Revoco davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revoca un user ID"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoca una chiave secondaria"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "abilita una chiave"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "disabilita una chiave"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostra l'ID fotografico"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "� disponibile una chiave segreta.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Per fare questo serve la chiave segreta.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4143,267 -3360,210 +4258,267 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "La chiave � stata revocata."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Firmo davvero tutti gli user ID? "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Firmo davvero tutti gli user ID? "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "classe della firma sconosciuta"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Questo comando non � permesso in modalit� %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Devi selezionare almeno un user ID.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Tolgo davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Tolgo davvero questo user ID? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Tolgo davvero questo user ID? "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vuoi davvero cancellare questa chiave? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Revoco davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Revoco davvero questo user ID? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Vuoi davvero revocare questa chiave? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Vuoi davvero revocare le chiavi selezionate? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vuoi davvero revocare questa chiave? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "imposta la lista di preferenze"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Aggiorno davvero le preferenze? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Salvo i cambiamenti? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Esco senza salvare? "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "chiave segreta `%s' non trovata: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "User ID inesistente.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Niente da firmare con la chiave %08lX\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Caratteristiche: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Nota: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Questa chiave pu� essere revocata dalla chiave %s "
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Questa chiave pu� essere revocata dalla chiave %s "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (sensibile)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossibile creare %s: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocata]"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr "[scadenza: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[scadenza: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " fiducia: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fiducia: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Questa chiave � stata disabilitata"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4412,19 -3572,14 +4527,19 @@@ msgstr "
"corretta\n"
"finch� non eseguirai di nuovo il programma.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revocata]"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4433,17 -3588,14 +4548,17 @@@ msgstr "
" potrebbe fare diventare un altro user ID il primario "
"predefinito.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4452,80 -3604,63 +4567,80 @@@ msgstr "
"ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
" pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Cancellare questa firma corretta? (s/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Cancellare questa firma non valida? (s/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Cancellare davvero questa autofirma? (s/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Cancellata %d firma.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Cancellate %d firme.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Non � stato cancellato nulla.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
#, fuzzy
msgid "invalid"
msgstr "armatura non valida"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "L'user ID \"%s\" � stato revocato."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "L'user ID \"%s\" � stato revocato."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "L'user ID \"%s\" � stato revocato."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4535,204 -3670,170 +4650,212 @@@ msgstr "
" designato pu� causarne il rifiuto da parte di alcune versioni\n"
" di PGP.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
"PGP 2.x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Inserisci l'user ID del revocatore designato: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"impossibile nominare una chiave come revocatore designato di s� stessa\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
"annullata.\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "Seleziona al massimo una chiave secondaria.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambio la data di scadenza per la chiave primaria.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
"incrociata\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Devi selezionare esattamente un user ID.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Annotazione della firma: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Sovrascrivo (s/N)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Nessun user ID con l'indice %d\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " firmata da %08lX il %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (non esportabile)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Questa chiave � scaduta il %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Creare un certificato di revoca per questa firma? (s/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " firmata da %08lX il %s%s\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (non esportabile)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocata da %08lX il %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Stai per revocare queste firme:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Creare davvero i certificati di revoca? (s/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4775,14 -3868,10 +4898,14 @@@ msgstr "scrittura della autofirma\n
msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "dimensione della chiave non valida; uso %u bit\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@@ -5080,41 -4120,36 +5203,46 @@@ msgstr "
msgid "Real name: "
msgstr "Nome e Cognome: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Il nome non pu� iniziare con una cifra\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Indirizzo di Email: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non � valido\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Commento: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Stai usando il set di caratteri `%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5125,7 -4160,6 +5253,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
@@@ -5140,35 -4174,28 +5268,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Per favore correggi prima l'errore\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5176,23 -4203,19 +5304,23 @@@ msgstr "
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5204,7 -4227,6 +5332,7 @@@ msgstr "
"programma con l'opzione \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5216,12 -4238,10 +5344,12 @@@ msgstr "
"dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
"numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5229,56 -4249,45 +5357,56 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' � gi� compresso\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Uso lo stesso questa chiave? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
msgid "creating anyway\n"
msgstr "genera una nuova coppia di chiavi"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "scrittura della chiave pubblica in `%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5288,7 -4297,6 +5416,7 @@@ msgstr "
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5296,7 -4304,6 +5424,7 @@@ msgstr "
"la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5304,236 -4311,186 +5432,236 @@@ msgstr "
"la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crea davvero? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "mai "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politica critica di firma: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politica di firma: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Annotazione critica della firma: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Annotazione della firma: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "una firma non corretta\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d firme non corrette\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Portachiavi"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "saltata `%s': %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Impronta digitale della chiave primaria:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Impronta digitale della chiave primaria:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impronta digitale ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "controllo il portachiavi `%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: portachiavi creato\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
@@@ -5541,12 -4498,10 +5669,12 @@@
"firmata con la tua chiave %08lX il %s\n"
"\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
@@@ -5580,7 -4529,6 +5708,7 @@@ msgstr "dati cifrati con la chiave pubb
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
@@@ -5626,258 -4565,206 +5754,258 @@@ msgstr "decifratura corretta\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome del file originale='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Firma valida da \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma NON corretta da \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma scaduta da \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Firma valida da \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "verifica della firma soppressa\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "impossibile gestire queste firme multiple\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Chiave disponibile presso: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[incerta]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Questa firma scadr� il %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "modo testo"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "sconosciuto"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo della chiave pubblica sconosciuto"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossibile controllare la firma: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "non � una firma separata\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma solitaria di classe 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "firma vecchio stile (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "impossibile aprire il file: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "algoritmo di cifratura non implementato"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d \"%s\" � una opzione deprecata\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "usa al suo posto \"%s%s\"\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Non compresso"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "Non compresso"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "classe della firma sconosciuta"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6077,31 -4931,24 +6205,31 @@@ msgstr "Questa foto � giusta? (s/N/q)
msgid "unable to display photo ID!\n"
msgstr "impossibile mostrare l'ID fotografico\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Nessuna ragione specificata"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Questa chiave � stata sostituita"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Questa chiave � stata compromessa"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "La chiave non � pi� usata"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "L'user ID non � pi� valido"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "ragione della revoca: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "commento alla revoca: "
@@@ -6115,100 -4962,81 +6243,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Nessun valore di fiducia assegnato a:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alias \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "Questa chiave probabilmente appartiene al proprietario\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Non lo so\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NON mi fido\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Mi fido definitivamente\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = torna al men� principale\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = salta questa chiave\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " q = abbandona\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Cosa hai deciso? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Vuoi davvero assegnare fiducia definitiva a questa chiave? "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Questa chiave probabilmente appartiene al proprietario\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Questa chiave ci appartiene\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6220,117 -5048,92 +6348,117 @@@ msgstr "
"rispondere s� alla prossima domanda.\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Uso lo stesso questa chiave? "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Questo pu� significare che la firma � stata falsificata.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Nota: questa chiave � stata disabilitata.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Nota: questa chiave � scaduta!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma � probabilmente un FALSO.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: saltata: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: saltata: chiave pubblica disabilitata\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: saltata: chiave pubblica gi� presente\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6338,76 -5141,59 +6466,76 @@@ msgstr "
"\n"
"Inserisci l'user ID. Termina con una riga vuota: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "User ID inesistente.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "La chiave pubblica � disabilitata.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "saltata: chiave pubblica gi� impostata\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Firma separata.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Inserisci il nome del file di dati: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "viene letto stdin...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "non ci sono dati firmati\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "impossibile aprire i dati firmati `%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "impossibile aprire i dati firmati `%s'\n"
@@@ -6447,8 -5226,6 +6575,8 @@@ msgstr "NOTA: chiave %08lX scaduta il %
msgid "Note: key has been revoked"
msgstr "NOTA: la chiave � stata revocata"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet fallito: %s\n"
@@@ -6458,43 -5234,39 +6586,49 @@@
msgid "key %s has no user IDs\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Revocabile da:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Questa � una chiave di revoca sensibile)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "� disponibile una chiave segreta.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Creare un certificato di revoca per questa chiave? "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "Forzato l'output con armatura ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet fallito: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Certificato di revoca creato.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "non sono state trovate chiavi di revoca per `%s'\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Creare un certificato di revoca per questa chiave? "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6502,19 -5274,27 +6636,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "chiave segreta `%s' non trovata: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Creare un certificato di revoca per questa chiave? "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6534,33 -5314,26 +6681,33 @@@ msgstr "
"disponibili\n"
"ad altri!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Per favore scegli il motivo della revoca:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Cancella"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probabilmente volevi scegliere %d)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Motivo della revoca: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Non � stata data una descrizione)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Va bene cos�? "
@@@ -6586,40 -5355,33 +6733,40 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
"ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
"incrociata\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostrami ulteriori informazioni\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
"non valida\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondi\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6627,7 -5389,6 +6774,7 @@@ msgstr "
"la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6635,31 -5396,26 +6782,31 @@@ msgstr "
"la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: la chiave � stata revocata"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"si suppone una firma non valida della chiave %08lX a causa di un\n"
"bit critico sconosciuto\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"chiave %08lX: non c'� una subchiave per il pacchetto di revoca della "
"subchiave\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
@@@ -6708,34 -5458,28 +6855,34 @@@ msgstr "
msgid "signing:"
msgstr "firma:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "sar� usato il cifrario %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"la chiave non � indicata come insicura - impossibile usarla con il RNG "
"finto!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "saltata `%s': doppia\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "saltata: chiave pubblica gi� presente\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
"le firme!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@@ -6783,7 -5519,6 +6930,7 @@@ msgstr "errore cercando il record dell
msgid "read error in '%s': %s\n"
msgstr "errore di lettura: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync fallita: %s\n"
@@@ -6812,7 -5542,6 +6959,7 @@@ msgstr "trustdb rec %lu: scrittura fall
msgid "trustdb transaction too large\n"
msgstr "transazione del trustdb troppo grande\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
@@@ -6929,119 -5635,95 +7076,119 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "`%s' non � un key ID lungo valido\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "chiave %08lX: accettata come chiave affidabile\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "chiave %08lX: appare nel trustdb pi� di una volta\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "chiavi marcate definitivamente affidabili.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "trust record %lu, tipo %d: read fallita: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "il trust record %lu non � del tipo richiesto %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "non � necessario un controllo del trustdb\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "il prossimo controllo del trustdb sar� fatto il %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "non � necessario un controllo del trustdb\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "non � necessario un controllo del trustdb\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "chiave pubblica %08lX non trovata: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "per favore usa --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "controllo il trustdb\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@@ -7278,11 -5911,9 +7425,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7423,12 -6026,10 +7570,12 @@@ msgstr "Firma %s, algoritmo di digest %
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@@ -7449,7 -6047,6 +7596,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7509,12 -6094,10 +7656,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7946,7 -6437,6 +8093,7 @@@ msgstr "errore creando il portachiavi `
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "Generazione della chiave fallita: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8544,7 -6914,6 +8691,7 @@@ msgstr "certificato danneggiato
msgid " runtime cached certificates: %u\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "Certificato di revoca creato.\n"
@@@ -8554,8 -6922,6 +8701,8 @@@
msgid "certificate cached\n"
msgstr "la preferenza %c%lu � doppia\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@@ -8617,7 -6972,6 +8764,7 @@@ msgstr "cancellazione del keyblock fall
msgid "not removing file '%s'\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -8842,221 -7152,178 +8989,221 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "risposta non valida dall'agent\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "impossibile aprire il file: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet fallito: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "scrittura in `%s'\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "genera un certificato di revoca"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "verifica della firma soppressa\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "impossibile creare la directory `%s': %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "impossibile creare la directory `%s': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "scrittura in `%s'\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr ""
"ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: errore durante la lettura del record libero: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? problema controllando la revoca: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
@@@ -9102,75 -7359,59 +9249,75 @@@ msgstr "errore creando `%s': %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "errore leggendo `%s': %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "chiave `%s' non trovata: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "Certificato di revoca creato.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "certificato danneggiato"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "certificato danneggiato"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "certificato danneggiato"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "certificato danneggiato"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Inserisci l'user ID del revocatore designato: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9178,226 -7419,155 +9325,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "impossibile connettersi a `%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "la preferenza %c%lu � doppia\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOTA: la chiave � stata revocata"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "impossibile eseguire stat su `%s': %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: creazione della tabella hash fallita: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "impossibile connettersi a `%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmi gestiti:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "Esco senza salvare? "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9410,92 -7580,73 +9530,92 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opzioni] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "riga troppo lunga\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "errore: impronta digitale non valida\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "errore di lettura: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
# ??? (Md)
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "non esaminato"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9746,12 -7846,10 +9866,12 @@@ msgstr "cerco \"%s\" sul server HKP %s\
msgid "malloc failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9786,11 -7878,10 +9906,12 @@@ msgstr "errore leggendo `%s': %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "chiave `%s' non trovata: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9938,72 -7999,61 +10059,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s: creazione della tabella hash fallita: %s\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10260,11 -8250,9 +10386,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/ja.gmo
index abda871,0000000..0523610
mode 100644,000000..100644
Binary files differ
diff --cc po/ja.po
index a03ae02,c8e685c..dc219c3
--- a/po/ja.po
+++ b/po/ja.po
@@@ -8,10 -8,9 +8,10 @@@
#
msgid ""
msgstr ""
- "Project-Id-Version: gnupg 2.1.8\n"
+ "Project-Id-Version: gnupg 2.1.9\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-10-09 17:17+0200\n"
- "PO-Revision-Date: 2015-09-15 15:12+0900\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
+ "PO-Revision-Date: 2015-10-13 11:32+0900\n"
"Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
"Language-Team: none\n"
"Language: ja\n"
@@@ -69,7 -58,6 +69,7 @@@ msgstr "|pinentry-tt|パスフレーズ
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "品質:"
@@@ -79,11 -67,9 +79,11 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr "pinentry.qualitybar.tooltip"
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -91,7 -77,6 +91,7 @@@ msgstr "
"あなたのPINを入力してください(このセッションで秘密鍵のロックを解除するために"
"使われます)"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -99,53 -84,40 +99,53 @@@ msgstr "
"あなたのパスフレーズを入力してください(このセッションで秘密鍵のロックを解除す"
"るために使われます)"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "パスフレーズ:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "一致しません - もう一度"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (現在 %d / 最大 %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr "繰り返し:"
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "PINが長すぎます"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "パスフレーズが長すぎます"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "PINに無効な文字があります"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "PINが短すぎます"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "不正なPINです"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "パスフレーズが不正です"
@@@ -154,24 -125,10 +154,24 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, c-format
msgid "can't create '%s': %s\n"
msgstr "'%s'が作成できません: %s\n"
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
@@@ -246,11 -190,9 +246,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "以下のシリアル番号のカードを挿入してください"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "今のカードを抜き、以下のシリアル番号のカードを挿入してください"
@@@ -382,41 -298,27 +382,41 @@@ msgstr "
"@オプション:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "デーモン・モードで実行 (バックグラウンド)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "サーバ・モードで実行 (フォアグラウンド)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "冗長"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "いくらかおとなしく"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sh-形式のコマンド出力"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "csh-形式のコマンド出力"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FILE|FILEからオプションを読み込みます"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "コンソールからデタッチしない"
@@@ -491,11 -376,6 +491,11 @@@ msgstr "puttyサポートを有功に�
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "バグは <@EMAIL@> までご報告ください。\n"
@@@ -511,138 -389,100 +511,137 @@@ msgstr "
"形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の秘密鍵の管理\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "無効なdebug-level '%s'が与えられました\n"
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
- #: agent/gpg-agent.c:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, c-format
msgid "option file '%s': %s\n"
msgstr "オプション・ファイル '%s': %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "'%s' からオプションを読み込みます\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "*注意*: '%s'はオプションとは考えられません\n"
- #: agent/gpg-agent.c:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "ソケットが作成できません: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "ソケット名'%s'は長すぎます\n"
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
- #: agent/gpg-agent.c:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "ソケットのナンス取得エラー\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "'%s'でソケットのバインドのエラー: %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() に失敗しました: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "ソケット'%s'でlisten\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "ディレクトリ'%s'が作成できません: %s\n"
- #: agent/gpg-agent.c:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "ディレクトリ'%s'が作成されました\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s'でstat()が失敗しました: %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "'%s'をホーム・ディレクトリに使えません\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %dでナンスの読み込みエラー: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "ハンドラ0x%lx (fd %d に対する)が開始\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が開始\n"
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 停止しました\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "このセッションでgpg-agentは実行されていません\n"
@@@ -658,8 -496,6 +657,8 @@@ msgstr "
"形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
"パスワードキャッシュの管理\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -667,9 -503,6 +666,9 @@@ msgstr "
"@コマンド:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -725,7 -550,6 +724,7 @@@ msgstr "キャンセルされました\
msgid "error while asking for the passphrase: %s\n"
msgstr "パスフレーズを問い合わせする際、エラー: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, c-format
msgid "error opening '%s': %s\n"
msgstr "'%s'を開く際、エラー: %s\n"
@@@ -908,8 -698,6 +907,8 @@@ msgstr "パイプの作成エラー: %s
msgid "error creating a stream for a pipe: %s\n"
msgstr "パイプのストリーム作成エラー: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "プロセスforkエラー: %s\n"
@@@ -1059,7 -815,6 +1058,7 @@@ msgstr "gpg-agentが実行されてい�
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "agentの起動のため、%d秒待ちます\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr "エージェントへの接続が確立しました。\n"
@@@ -1077,7 -829,6 +1076,7 @@@ msgstr "dirmngrが動いていませ�
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "dirmngrの起動のため、%d秒待ちます\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr "dirmngrへの接続が確立しました\n"
@@@ -1335,7 -1026,6 +1334,7 @@@ msgstr "オプション\"%.50s\"はあ�
msgid "command \"%.50s\" is ambiguous\n"
msgstr "コマンド\"%.50s\"はあいまいです\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "メモリがありません\n"
@@@ -1513,19 -1165,14 +1512,19 @@@ msgstr "プロキシ%sのクライア�
msgid "Enter passphrase: "
msgstr "パスフレーズを入力: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGPカードが利用できません: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGPカードno. %sを検出\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "これはバッチ・モードではできません\n"
@@@ -1537,153 -1182,114 +1536,153 @@@ msgstr "このコマンドが使える�
msgid "Reset Code not or not anymore available\n"
msgstr "リセット・コードが(もはや)利用可能ではありません\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "あなたの選択は? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[未設定]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "男"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "女"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "無指定"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "強制なし"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "強制"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "エラー： 普通のASCIIだけが今、許可されています。\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "エラー: \"<\"文字は使えません。\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "エラー: 二重の空白は禁止です。\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "カード所有者の姓 (surname): "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "カード所有者の名 (given name): "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "エラー: つないだ名前が長すぎます (上限%d文字)。\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "公開鍵を取得するURL: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "エラー: URLが長すぎます (上限%d文字)。\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "十分なメモリの確保のエラー: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, c-format
msgid "error reading '%s': %s\n"
msgstr "'%s'の読み込みエラー: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "'%s'の書き込みエラー: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "ログイン・データ (アカウント名): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "エラー: ログイン・データが長すぎます (上限%d文字)。\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "プライベート DO データ: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "エラー: プライベート DOが長すぎます (上限%d文字)。\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "言語の優先指定: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "エラー: 優先指定の文字列の長さが無効です。\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "エラー: 優先指定の文字列に無効な文字があります。\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性別 ((M)男、(F)女、または空白): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "エラー: 無効な応答。\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "CAのフィンガープリント: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "エラー: 無効な形式のフィンガープリント。\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "鍵は操作できません: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "OpenPGPカードでありません"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "現行鍵情報の取得エラー: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "既存の鍵を置き換えしますか? (y/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1693,55 -1299,43 +1692,55 @@@ msgstr "
" 鍵生成が成功しない場合、あなたのカードに関する技術文書を確認し、\n"
" 利用できる鍵長について確認ください。\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "署名鍵の鍵長は? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "暗号化鍵の鍵長は? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "認証鍵の鍵長は? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%uビットに切り上げます\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "今、%uビットの鍵を生成するようにカードは再コンフィグされました\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "鍵%dの長さを%u bit に変更する際にエラー: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "暗号化鍵のカード外バックアップを作成しますか? (Y/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
msgid "Note: keys are already stored on the card!\n"
msgstr "*注意*: 秘密鍵はもうカードに保管してあります!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "既存の鍵を置き換えますか? (y/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1752,138 -1346,103 +1751,138 @@@ msgstr "
" PIN = '%s' 管理者PIN = '%s'\n"
"次のコマンドを使って変更すべきです --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "生成する鍵の型を選択してください:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) 署名鍵\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) 暗号化鍵\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) 認証鍵\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "無効な選択です。\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "鍵を保管する場所を選択してください:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "KEYTOCARDが失敗しました: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
msgid "This command is not supported by this card\n"
msgstr "このカードでは、このコマンドはサポートされていません。\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "*注意*: このコマンドはカードに保管してあるすべての鍵を破壊します!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
msgid "Continue? (y/N) "
msgstr "続けますか? (y/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "工場出荷リセットを行いますか? (本当なら \"yes\" と入力) "
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "このメニューを終了"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "管理コマンドを表示"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "このヘルプを表示"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "全有効データを表示"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "カード所有者の名前の変更"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "鍵を取得するURLの変更"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "カードURLで指定された鍵の取得"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "ログイン名の変更"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "言語の優先指定の変更"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "カード所有者の性別の変更"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "CAフィンガープリントの変更"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "署名強制PINフラグを反転"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "新しい鍵を生成"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "PINブロックの解除や変更のメニュー"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "PINを確認しすべてのデータを表示する"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "PINをリセット・コードでブロックを解除する"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr "すべての鍵とデータを破壊します"
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "管理者専用コマンド\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "管理者コマンドが許可されています\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "管理者コマンドは禁止されています\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "無効なコマンド (\"help\"を参照)\n"
@@@ -1891,72 -1449,59 +1890,79 @@@
msgid "--output doesn't work for this command\n"
msgstr "このコマンドで--outputは機能しません\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s'が開けません\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "鍵\"%s\"が見つかりません: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "鍵ブロックの読み込みエラー: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "鍵\"%s\"が見つかりません: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(フィンガー・プリントで鍵を指定してない限り)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "\"--yes\"なしでバッチ・モードではできません\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "この鍵を鍵リングから削除しますか? (y/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "これは秘密鍵です! 本当に削除しますか? (y/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "秘密%sの削除に失敗しました: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "鍵"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "subkey"
msgstr "サブ鍵: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "鍵ブロックの削除に失敗しました: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "所有者信用情報をクリアしました\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "この公開鍵にたいする秘密鍵\"%s\"があります!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "まず\"--delete-secret-keys\"オプションでこれを削除してください。\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "パスフレーズの作成エラー: %s\n"
@@@ -2005,7 -1542,6 +2011,7 @@@ msgstr "
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%sを%sモードで使うことはできません\n"
@@@ -2088,261 -1608,215 +2094,282 @@@ msgstr "*警告*: 一時ファイルを
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "*警告*: 一時ディレクトリ'%s'を削除できません: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "ローカルのみと指定された署名をエクスポートします"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "ユーザIDの属性(通常フォトID)をエクスポートします"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "\"sensitive\"(機密)と指定された失効鍵をエクスポートします"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "エクスポートの際、利用できない部分を除去する"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "エクスポートの際、できるだけ除去する"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "秘密鍵のエクスポートは認められません\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "鍵%s: PGP 2.x形式の鍵です - スキップします\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "鍵%s: 鍵はカード上にあります - スキップします\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
msgid " - skipped"
msgstr " - スキップされました"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "*警告*: 何もエクスポートされていません\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[ユーザIDが見つかりません]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "'%s'を %s から自動取得\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "'%s'を %s から取得する際のエラー: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "フィンガープリントがありません"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "オプション\"%.50s\"に引数がありません\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NAME|デフォルトの秘密鍵としてNAMEを用いる"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "副鍵%s(主鍵%sではなく)を用います\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "署名を作成"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "クリア・テクスト署名を作成"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "分遣署名を作成"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "データを暗号化"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "暗号化には共通鍵暗号方式のみを使用"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "データを復号 (デフォルト)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "署名を検証"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "鍵の一覧"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "鍵と署名の一覧"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "鍵署名の検査と一覧"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "鍵とフィンガープリントの一覧"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "秘密鍵の一覧"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "新しい鍵ペアを生成"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
msgid "quickly generate a new key pair"
msgstr "すばやく新しい鍵ペアを生成"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
msgid "quickly add a new user-id"
msgstr "すばやく新しいユーザIDを追加"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr "全機能の鍵ペアを生成"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "失効証明書を生成"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "公開鍵リングから鍵を削除"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "秘密鍵リングから鍵を削除"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
msgid "quickly sign a key"
msgstr "鍵にすばやく署名"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
msgid "quickly sign a key locally"
msgstr "鍵へすばやくローカルに署名"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "鍵に署名"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "鍵へローカルに署名"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "鍵への署名や編集"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "パスフレーズの変更"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "鍵をエクスポートする"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "鍵サーバに鍵をエクスポートする"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "鍵サーバから鍵をインポートする"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "鍵サーバの鍵を検索する"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "鍵サーバから鍵を全部更新する"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "鍵のインポート/マージ"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "カード・ステイタスを表示"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "カードのデータを変更"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "カードのPINを変更"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "信用データベースを更新"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "メッセージ・ダイジェストを表示"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "サーバ・モードで実行"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "ASCII形式の外装を作成"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|USER-ID用に暗号化"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "正準テキスト・モードを使用"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|FILE|出力をFILEに書き出す"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "無変更"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "上書き前に確認"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "厳密なOpenPGPの振舞を採用"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2350,7 -1824,6 +2377,7 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2370,11 -1843,9 +2397,11 @@@ msgstr "
" --list-keys [名前] 鍵を表示\n"
" --fingerprint [名前] フィンガープリントを表示\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "使い方: @GPG@ [オプション] [ファイル] (ヘルプは -h)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2384,7 -1855,6 +2411,7 @@@ msgstr "
"署名、検査、暗号化または復号\n"
"デフォルトの操作は、入力データに依存\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2392,563 -1862,496 +2419,635 @@@ msgstr "
"\n"
"サポートしているアルゴリズム:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "公開鍵: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "暗号方式: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "ハッシュ: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "圧縮: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "使い方: %s [オプション] %s\n"
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "対立するコマンド\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない所有\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない所有\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない許可\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない許可\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "不明のコンフィグレーション項目'%s'\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "鍵の一覧時にフォトIDを表示する"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
msgid "show key usage information during key listings"
msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "署名の一覧時にポリシーURLを表示する"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "署名の一覧時にすべての注釈を表示する"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "署名の一覧時にIETF標準注釈を表示する"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "署名の一覧時にユーザの注釈を表示する"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr "署名の一覧時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "鍵の一覧時にユーザIDの有効性を表示する"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "鍵の一覧に鍵リングの名前を表示する"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "署名の一覧時に有効期限の日付を表示する"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "利用可能な鍵:\n"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option '%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "不明のオプション'%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command '%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "不明のコマンド'%s'\n"
+
++#: g10/gpg.c:2085
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
- #: g10/gpg.c:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "オプション\"%.50s\"はあいまいです\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring '%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "鍵リング'%s'の作成エラー: %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt が古すぎます (必要 %s, 現在 %s)\n"
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "*注意*: 普通%sは使いません!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s'は、有効な署名表現ではありません\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無効な pinentry mode '%s'です\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s'は、有効な文字集合ではありません\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無効なインポート・オプションです\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "無効なインポート・オプションです\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無効なエクスポート・オプションです\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "無効なエクスポート・オプションです\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無効な一覧オプションです\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "無効な一覧オプションです\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "署名の検証時にフォトIDを表示する"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "署名の検証時にポリシーURLを表示する"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "署名の検証時にすべての注釈を表示する"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "署名の検証時にIETF標準注釈を表示する"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "署名の検証時にユーザの注釈を表示する"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr "署名の検証時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "署名の検証時にユーザIDの有効性を表示する"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr "署名の検証時に主なユーザIDだけをを表示する"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "PKAデータで署名を検証する"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "有効なPKAデータで署名の信用度を上昇させる"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無効な検証オプションです\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "無効な検証オプションです\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-pathを%sに設定不能\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "*警告*: %sは%sより優先\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%sは%sとともに使うことはできません!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%sは%sとともに使っても無意味です!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s のため、セキュアでないメモリで実行しません\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "選択された暗号アルゴリズムは、無効です\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "選択された圧縮アルゴリズムは、無効です\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-neededは正の値が必要です\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neededは1より大きな値が必要です\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "無効なdefault-cert-level。0か1か2か3でなければなりません\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "無効なデフォルトの優先指定\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "無効な個人用暗号方式の優先指定\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "無効な個人用ダイジェストの優先指定\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "無効な個人用圧縮の優先指定\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%sは%sではまだ機能しません\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3497
++#: g10/gpg.c:3868
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3502
++#: g10/gpg.c:3873
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信用データベースの初期化に失敗しました: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
- #: g10/gpg.c:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, fuzzy, c-format
+ #| msgid "line %d: invalid date given\n"
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "行 %d: 無効な日付が与えられました\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [ファイル名]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [ファイル名]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [ファイル名]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [ファイル名]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [ファイル名]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ファイル名]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [ファイル名]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ファイル名]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [ファイル名]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [ファイル名]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key ユーザid"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key ユーザid"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key ユーザid [コマンド]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd <ユーザid>"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "鍵サーバへの送信に失敗しました: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "鍵サーバからの受信に失敗しました: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "鍵のエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "鍵サーバの検索に失敗しました: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "鍵サーバの更新に失敗しました: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "外装除去に失敗しました: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "外装に失敗しました: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[ファイル名]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "開始します。メッセージを打ってください ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "あたえられた証明書ポリシーURLは無効です\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "あたえられた署名ポリシーURLは無効です\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "指定された優先鍵サーバURLは無効です\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|FILE|鍵リングFILEの鍵を扱います"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "日時の矛盾を警告だけにします"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|このFDにステイタス情報を書き出す"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "使い方: gpgv [オプション] [ファイル] (ヘルプは -h)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3120,7 -2489,6 +3219,7 @@@ msgstr "それによって、潜在的�
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:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "鍵%s: ユーザIDがありません\n"
@@@ -3130,7 -2497,6 +3229,7 @@@
msgid "key %s: %s\n"
msgstr "鍵 %s: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr "インポートの検査で拒否されました"
@@@ -3153,7 -2515,6 +3252,7 @@@ msgstr "鍵%s: 有効なユーザIDが�
msgid "this may be caused by a missing self-signature\n"
msgstr "これはおそらく自己署名のないせいでしょう\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "鍵%s: 公開鍵が見つかりません: %s\n"
@@@ -3163,252 -2523,215 +3262,267 @@@
msgid "key %s: new key - skipped\n"
msgstr "鍵%s: 新しい鍵です - スキップします\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "書き込み可能な鍵リングが見つかりません: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "'%s'への書き込み\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "鍵リング'%s'の書き込みエラー: %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "鍵%s: 公開鍵\"%s\"をインポートしました\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "鍵%s: こちらの複製と合いません\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
- #: g10/import.c:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
- #: g10/import.c:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを1個\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを%d個\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "鍵%s: \"%s\" 新しい署名を1個\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "鍵%s: \"%s\" 新しい署名を%d個\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を1個\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を%d個\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "鍵%s:\"%s\"変更なし\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "鍵%s: 秘密鍵をインポートしました\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "鍵 %s: 秘密鍵はもうあります\n"
- #: g10/import.c:1562
++#: g10/import.c:1575
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, c-format
msgid "secret key %s: %s\n"
msgstr "秘密鍵 %s: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "秘密鍵のインポートは禁止です\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
- #: g10/import.c:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "鍵%s:\"%s\"失効証明書をインポートしました\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "鍵%s: 署名に対応するユーザIDがありません\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"のサポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:1979
++#: g10/import.c:2021
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"の自己署名が、無効です\n"
- #: g10/import.c:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "鍵%s: 無効な直接鍵署名\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "鍵%s: 鍵に対応する副鍵がありません\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "鍵%s: 無効な副鍵の対応です\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "鍵%s: 多重副鍵の対応を削除します\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "鍵%s: 鍵失効に対する副鍵がありません\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "鍵%s: 無効な副鍵失効です\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "鍵%s: 無効な副鍵の多重失効を削除します\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "鍵%s: スキップしたユーザID\"%s\"\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "鍵%s: スキップした副鍵\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "鍵%s: エクスポート不可な署名 (クラス0x%02X) - スキップします\n"
- #: g10/import.c:2198
++#: g10/import.c:2240
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "鍵%s: 失効証明書が誤って設定されています - スキップします\n"
- #: g10/import.c:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "鍵%s: 無効な失効証明書: %s - スキップします\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "鍵%s: 副鍵署名の場所が、誤っています - スキップします\n"
- #: g10/import.c:2238
++#: g10/import.c:2280
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "鍵%s: 予期せぬ署名クラス (0x%02X) - スキップします\n"
- #: g10/import.c:2367
++#: g10/import.c:2409
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "鍵%s: 重複したユーザIDの検出 - マージ\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sを取ってきます\n"
- #: g10/import.c:2447
++#: g10/import.c:2489
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sが存在しません。\n"
- #: g10/import.c:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "鍵%s:\"%s\"失効証明書の追加\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "鍵%s: 直接鍵署名を追加\n"
@@@ -3433,61 -2752,53 +3547,67 @@@ msgstr "keybox'%s'が作成されまし
msgid "keyring '%s' created\n"
msgstr "鍵リング'%s'ができました\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "keyblock リソース'%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening '%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "'%s'を開く際、エラー: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "鍵リング・キャッシュの再構築に失敗しました: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[失効]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[自己署名]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "不正な署名1個\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "不正な署名%d個\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "鍵がないため1個の署名を検査しません\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "鍵がないため%d個の署名を検査しません\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "エラーのため1個の署名を検査しません\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "エラーのため%d個の署名を検査しません\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "有効な自己署名のないユーザIDを1個検出\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "有効な自己署名のないユーザIDを%d個検出\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3498,17 -2809,14 +3618,17 @@@ msgstr "
"(パスポートを見せてもらったり、他から得たフィンガープリントを検査したり、など"
"など)\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = まぁまぁ信用する\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 充分に信用する\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3517,45 -2825,38 +3637,50 @@@ msgstr "
"信用署名の深さを入力してください。\n"
"深さが1より大きいと、署名しようとしている鍵で信用署名を作れます。\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "署名を制限するドメインを入力するか、空行を入力してください。\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ユーザID\"%s\"は、失効されています。"
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "それでもこの鍵に署名したいですか? (y/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " 署名不能。\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ユーザID \"%s\"は、期限切れです。"
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ユーザID \"%s\"は、自己署名されていません。"
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ユーザID \"%s\"は署名可能です。 "
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "署名しますか? (y/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3564,11 -2865,9 +3689,11 @@@ msgstr "
"\"%s\"にたいする自己署名は、\n"
"PGP 2.x形式の署名です。\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "OpenPGPの自己署名に格上げしたいですか? (y/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3577,11 -2876,9 +3702,11 @@@ msgstr "
"\"%s\"に対するあなたの今の署名\n"
"は期限切れです。\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "新しい署名を発行し、期限切れ署名と置き換えたいですか? (y/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3590,43 -2887,34 +3715,43 @@@ msgstr "
"\"%s\"にたいするあなたの今の署名\n"
"はローカルな署名です。\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "エクスポート可能な署名に格上げしたいですか? (y/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\"は鍵%sでもうローカルに署名してあります\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\"は鍵%sでもう署名してあります\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "それでも再署名したいですか? (y/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "鍵%sで署名すべきものはありません\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "この鍵は期限切れです!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "この鍵は%sで期限が切れます。\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "同時に署名も期限切れとしたいですか? (Y/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3635,31 -2923,25 +3760,31 @@@ msgstr "
"署名しようとしている鍵が実際に上記の名前の人のものかどうか、どの程度\n"
"注意して検証しましたか? 答がわからなければ、\"0\"を入力してください。\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 答えません。%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 全然、検査していません。%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 一応、検査しました。%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) かなり注意して検査しました。%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
msgid "Your selection? (enter '?' for more information): "
msgstr "選択は? (詳細は '?'): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3668,224 -2950,169 +3793,224 @@@ msgstr "
"本当にこの鍵にあなたの鍵\"%s\"で署名してよいですか\n"
"(%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "自己署名になるでしょう。\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "*警告*: 署名は、エクスポート不可に設定されません。\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "*警告*: 署名は、失効不可に設定されません。\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "署名は、エクスポート不可に設定されます。\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "署名は、失効不可に設定されます。\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "この鍵は全然、検査していません。\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "この鍵は一応、検査しました。\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "この鍵は、かなり注意して検査しました。\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "本当に署名しますか? (y/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "署名に失敗しました: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"鍵にはスタブあるいはカード上の項目しかありません - パスフレーズは変更されませ"
"ん。\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "鍵 %s: パスフレーズの変更エラー: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "鍵の署名を正しい場所に移動します\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "保存して終了"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "鍵のフィンガープリントを表示"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
msgid "show the keygrip"
msgstr "keygripを表示"
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "鍵とユーザIDの一覧"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "ユーザID Nの選択"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "副鍵Nの選択"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "署名の確認"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr "選択したユーザIDに署名する [* 以下の関連コマンドを参照 ]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "選択したユーザIDにローカルに署名"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "選択したユーザIDに信用署名を署名する"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "選択したユーザIDに失効不可の署名をする"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "ユーザIDの追加"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "フォトIDの追加"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "選択したユーザIDの削除"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "副鍵を追加"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "スマートカードへ鍵の追加"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "鍵をスマートカードへ移動"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "バックアップ鍵をスマートカードへ移動"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "選択した副鍵の削除"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "失効鍵の追加"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "選択したユーザIDから署名を削除する"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "鍵または選択した副鍵の有効期限を変更する"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "選択したユーザIDを主にする"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "優先指定の一覧 (エキスパート)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "優先指定の一覧 (冗長)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "選択したユーザIDに優先指定リストを設定"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "選択したユーザIDに優先鍵サーバのURLを設定"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "選択したユーザIDに注釈を設定する"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "パスフレーズの変更"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "所有者信用の変更"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "選択したユーザIDの署名を失効"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "選択したユーザIDの失効"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "鍵の失効または選択した副鍵の失効"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "鍵を有効にする"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "鍵を無効にする"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "選択したフォトIDを表示"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "使えないユーザIDをコンパクトにし、使えない署名を鍵から除去"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "使えないユーザIDをコンパクトにし、すべての署名を鍵から除去"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "秘密鍵が使用できます。\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "この実行には秘密鍵がいります。\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -3896,246 -3123,190 +4021,247 @@@ msgstr "
" 't' で始まると信用署名 (tsign)、'nr' で始まると失効不可署名\n"
" (nrsign)、もしくはこれらの組み合わせ (ltsign, tnrsign, など)となります。\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "鍵は、失効されています。"
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "本当に全ユーザIDに署名しますか? (y/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "本当に全ユーザIDに署名しますか? (y/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "ヒント: まず署名するユーザIDを選択します\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "不明の署名タイプ'%s'\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%sモードでこのコマンドは禁止です。\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "ユーザIDを少なくともひとつ選択してください。\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
- msgstr ""
+ msgstr "('%s'コマンドを使用してください。)\n"
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "最後のユーザIDは削除できません!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "選択した全ユーザIDを本当に削除しますか? (y/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "このユーザIDを本当に削除しますか? (y/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "この主鍵を本当に移動しますか? (y/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "鍵をきっかり1つ選択してください。\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "コマンドはファイル名の引数を期待します\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "バックアップ鍵を'%s'から読み込みする際のエラー: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "鍵を少なくとも1本選択してください。\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "選択した鍵を本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "この鍵を本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "選択した全ユーザIDを本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "このユーザIDを本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "この鍵全体を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "選択した副鍵を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "この副鍵を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"ユーザが指定した信用データベースを利用中、所有者信用は設定できません。\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "優先指定の一覧を設定:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "選択したユーザIDの優先指定を本当に更新しますか? (y/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "優先指定を本当に更新しますか? (y/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "変更を保存しますか? (y/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "保存せずに終了しますか? (y/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "更新に失敗しました: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "鍵は無変更なので更新は不要です。\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\"はフィンガープリントではありません\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" はプライマリ・フィンガープリントではありません\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "No matching user IDs."
msgstr "マッチするユーザIDはありません。"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "Nothing to sign.\n"
msgstr "署名するものがありません。\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "ダイジェスト: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "機能: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "鍵サーバ 修正しない"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "優先鍵サーバ: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "注釈: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x形式ユーザIDの優先指定が、ありません。\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "%sで%s鍵%sによって以下の鍵は、失効されました\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "この鍵は、%s鍵%sによって失効可能です"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(機密指定)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "作成: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "失効: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "期限切れ: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "有効期限: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "利用法: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "カード番号: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "信用: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "有効性: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "この鍵は使用禁止に設定されています"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4143,17 -3314,12 +4269,17 @@@ msgstr "
"プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
"ということを念頭においてください。\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "失効"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "期限切れ"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4161,15 -3327,12 +4287,15 @@@ msgstr "
"*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
" ユーザIDが主になると仮定する場合があります。\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "*警告*: あなたの暗号サブ鍵はもうすぐ期限切れとなります。\n"
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
msgid "You may want to change its expiration date too.\n"
msgstr "その有効期限も変更したいでしょう\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4179,78 -3342,61 +4305,78 @@@ msgstr "
"は、\n"
" この鍵を拒否するかもしれません。\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "それでも追加したいですか? (y/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "この正しい署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "この無効な署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "この不明の署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "この自己署名を本当に削除しますか? (y/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d個の署名を削除しました。\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d個の署名を削除しました。\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "何も削除していません。\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "無効"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ユーザID \"%s\" は、コンパクトになりました: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "ユーザID \"%s\": %d の署名が除去されました\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "ユーザID \"%s\": %d の署名が除去されました\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ユーザID \"%s\": 既に最小化されています\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ユーザID \"%s\": 既にクリーンとなっています\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4260,183 -3406,152 +4386,194 @@@ msgstr "
"では、\n"
" この鍵を拒否するかもしれません。\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x形式の鍵には指名失効者を追加できません。\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "指名失効者のユーザIDを入力してください: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x形式の鍵は、指名失効者に任命できません\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "指名失効者には、その鍵自体を任命できません\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "この鍵は失効者としてもう指名されています\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "*警告*: ある鍵を指名失効者に設定すると、元に戻せません!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "高々1個の副鍵を選択してください。\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "副鍵の有効期限を変更します。\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "主鍵の有効期限を変更します。\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3鍵の有効期限は変更できません\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "署名する副鍵%sはすでに相互証明されています\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "副鍵 %s は署名をしないので、相互証明の必要はありません\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "ユーザIDをきっかりひとつ選択してください。\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "ユーザID\"%s\"のv3自己署名をスキップします\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "優先鍵サーバURLを入力してください: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "本当に置き換えたいですか? (y/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "本当に削除したいですか? (y/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "注釈を入力: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "進みますか? (y/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d番のユーザIDはありません\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "ハッシュ%sのユーザIDはありません\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "%d番の副鍵はありません\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "%d番の副鍵はありません\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ユーザID:\"%s\"\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%sで%s%s%sに署名されています\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (エクスポート不可)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "この署名は%sで期限切れです。\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "それでも本当に失効したいですか? (y/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "この署名に対する失効証明書を作成しますか? (y/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "あなたによって署名されていません。\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "これらのユーザIDに鍵%sで署名しました:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (失効不可)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "あなたの鍵%sで%sに失効されています\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "これらの署名を失効しようとしています:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "失効証明書を本当に作成しますか? (y/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "秘密鍵がありません\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ユーザID\"%s\"は、もう失効されています\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "鍵 %s は、もう失効されています。\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "副鍵 %s は、もう失効されています。\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s (大きさ%ld) の鍵%s (uid %d) のフォトIDとして表示\n"
@@@ -4475,14 -3582,10 +4612,14 @@@ msgstr "自己署名を書き込みま�
msgid "writing key binding signature\n"
msgstr "鍵対応への署名を書き込みます\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "無効な鍵長。%uビットにします\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "鍵長を%uビットに丸めます\n"
@@@ -4772,40 -3826,35 +4909,45 @@@ msgstr "
msgid "Real name: "
msgstr "本名: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "名前に無効な文字があります\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "名前を数字で始めてはいけません\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "名前は5文字以上でなければなりません\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "電子メール・アドレス: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "有効な電子メール・アドレスではありません\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "コメント: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "コメントに無効な文字があります\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "あなたは文字集合'%s'を使っています。\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4816,7 -3865,6 +4958,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "電子メールのアドレスを本名やコメントに入れないように\n"
@@@ -4831,31 -3879,24 +4973,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "名前(N)、コメント(C)、電子メール(E)の変更、または終了(Q)? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "名前(N)、コメント(C)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "名前(N)、電子メール(E)の変更、または終了(Q)? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "名前(N)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "まずエラーを修正してください\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -4863,7 -3904,6 +5005,7 @@@ msgstr "
"秘密鍵を保護するためにパスフレーズがいります。\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@@ -4871,16 -3911,13 +5013,16 @@@ msgstr "
"パスフレーズを入力してください。これは新しく作られる暗号化鍵のカード外のバッ"
"クアップを保護するものです。"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "パスフレーズをちゃんと繰り返していません。再入力してください"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -4892,7 -3929,6 +5034,7 @@@ msgstr "
"このプログラムの\"--edit-key\"オプションでいつでも変更できます。\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -4903,12 -3939,10 +5045,12 @@@ msgstr "
"す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
"成器に十分なエントロピーを供給する機会を与えることができます。\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "鍵の生成に失敗しました: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -4919,52 -3953,41 +5061,52 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr "続けますか? (Y/n) "
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" の鍵はもうあります\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
msgid "Create anyway? (y/N) "
msgstr "それでも鍵を作成しますか? (y/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
msgid "creating anyway\n"
msgstr "いずれにしろ鍵を作成\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "注意: 全機能の鍵生成には \"%s %s\" を使います。\n"
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "鍵の生成が取り消されました。\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, c-format
msgid "writing public key to '%s'\n"
msgstr "'%s'へ公開鍵を書き込みます\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "書き込み可能な公開鍵リングが見つかりません: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -4972,247 -3995,193 +5114,247 @@@ msgstr "
"この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
"\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "主鍵の秘密部分が利用できません。\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鍵の秘密部分はカード上に保存されています。\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "本当に作成しますか? (y/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "カードへの鍵の保管に失敗しました: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "*注意*: カード鍵のバックアップが'%s'へ保存されます\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "無期限 "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "クリティカルな署名ポリシー: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "署名ポリシー: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "クリティカルな優先鍵サーバ: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "クリティカルな署名注釈: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "署名注釈: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
msgid "1 good signature\n"
msgstr "正しい署名1個\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, c-format
msgid "%d good signatures\n"
msgstr "正しい署名%d個\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr "*警告*: %lu 鍵がその大きさのためスキップされました\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "鍵リング"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "\"%s\"をスキップしました: %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr " 主鍵フィンガープリント:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " 副鍵フィンガープリント:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " 主鍵フィンガープリント:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " 副鍵フィンガープリント:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " フィンガープリント ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " カードシリアル番号 ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "'%s'から'%s'へ名前変更に失敗: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, c-format
msgid "caching keyring '%s'\n"
msgstr "鍵リング'%s'をキャッシュします\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu個の鍵までキャッシュ済 (%lu個の署名)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu個の鍵をキャッシュ済 (%lu個の署名)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: 鍵リングができました\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr "dirmngrのプロキシ・オプション設定を押し切る"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "失効した鍵を検索結果に含める"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "key IDによる検索に副鍵も含める"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr "dirmngrのタイムアウト・オプション設定を押し切る"
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "署名の検証時に自動的に鍵を取得する"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "鍵に設定される優先鍵サーバURLを与える"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "鍵に設定されたPKAレコードを鍵の取得時に与える"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "使用禁止"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "番号(s)、N)次、またはQ)中止を入力してください >"
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無効な鍵サーバ・プロトコルです (us %d!=handler %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\"鍵IDではありません: スキップします\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1本の鍵を%sから更新\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "*警告*: 鍵%sを%s経由で更新できません: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d本の鍵を%sから更新\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "鍵\"%s\"が鍵サーバに見つかりません\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "鍵が鍵サーバに見つかりません\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "既知の鍵サーバがありません (オプション--keyserverを使いましょう)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "鍵%sを%sからサーバ%sに要求\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "鍵%sを%sに要求\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "鍵%sを%sサーバ%sへ送信\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "鍵%sを%sへ送信\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, c-format
msgid "requesting key from '%s'\n"
msgstr "鍵を'%s'から要求\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "*警告*: URI %s からデータを取れません: %s\n"
@@@ -5246,7 -4209,6 +5388,7 @@@ msgstr "公開鍵による暗号化済�
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "%u-ビット%s鍵, ID %s, 日付%sに暗号化されました\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
@@@ -5292,215 -4245,166 +5434,210 @@@ msgstr "復号に成功\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "*警告*: 暗号化されたメッセージは改竄されています!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "保持したパスフレーズをクリアしました ID: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "復号に失敗しました: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "*注意*: 送信者は\"極秘とする\"ように求めています\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "元のファイル名='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "*警告*: 複数のプレインテクストが見られます\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "スタンドアロン失効 - \"gpg --import\"を使って適用してください\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "署名が見つかりません\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\"からの*不正な*署名"
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\"からの期限切れの署名"
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\"からの正しい署名"
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "署名の検証を省略\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "このあいまいな署名データは取り扱えません\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "%sに施された署名\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " %s鍵%sを使用\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "%sに%s鍵ID %sで施された署名\n"
- #: g10/mainproc.c:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "以下に鍵があります: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[不確定]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " 別名\"%s\""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "期限切れの署名 %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "この署名は%sで期限切れとなります\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s署名、ダイジェスト・アルゴリズム %s%s%s\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "バイナリ"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "テキストモード"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "不明の"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
msgid ", key algorithm "
msgstr "、鍵アルゴリズム "
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
"*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "署名を検査できません: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "分遣署名でありません\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "*警告*: 多重署名の検出。最初のものだけ検査します。\n"
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "クラス0x%02xのスタンドアロン署名\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "古い形式 (PGP 2.x) の署名\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "'%s'のfstatが%sで失敗しました: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d)が%sで失敗しました: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "*警告*: 実験的公開鍵アルゴリズム%sを使用します\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "*警告*: Elgamal署名+暗号化鍵は廃止されています\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "*警告*: 実験的暗号アルゴリズム %s を使用します\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "*警告*: 実験的ダイジェスト・アルゴリズム %sを使用\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "*警告*: ダイジェスト・アルゴリズム %s は廃止されています\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "注意: アルゴリズム %s を用いた署名は拒否されました\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: 廃止されたオプション\"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "*警告*: \"%s\"は、廃止されたオプションです\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "\"%s%s\"を代わりに使ってください\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "*警告*: \"%s\" は、廃止されているコマンドです - 使わないでください\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
"%s:%u: \"%s\"は、このファイルで使われなくなりました - %sになんの効果もありま"
"せん\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5508,35 -4412,33 +5645,41 @@@ msgstr "
"*警告*: \"%s%s\"は、使われなくなったオプションです - %s以外になんの効果もあり"
"ません\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "無圧縮"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "無圧縮|なし"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "このメッセージは、%sでは使用できません\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "あいまいなオプション'%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, c-format
msgid "unknown option '%s'\n"
msgstr "不明のオプション'%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "ECDSAの公開鍵は8ビットの倍数のSECエンコーディングを期待します\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type '%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "不明の署名タイプ'%s'\n"
+
+#: g10/openfile.c:85
#, c-format
msgid "File '%s' exists. "
msgstr "ファイル'%s'は既に存在します。"
@@@ -5724,31 -4593,24 +5867,31 @@@ msgstr "この写真は正しいです�
msgid "unable to display photo ID!\n"
msgstr "フォトIDが表示不能!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "理由は指定されていません"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "鍵がとりかわっています"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "鍵(の信頼性)が損なわれています"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "鍵はもはや使われていません"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "ユーザIDがもはや有効でありません"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "失効理由: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "失効のコメント: "
@@@ -5762,90 -4624,71 +5905,90 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "信用度が指定されていません:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " 別名\"%s\"\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"この鍵がこのユーザをなのる本人のものかどうか、どれくらい信用できますか?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = 知らない、または何とも言えない\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = 信用し ない\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = 究極的に信用する\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = メーン・メニューに戻る\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = この鍵はとばす\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " q = 終了\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr "この鍵の最小信用レベル: %s\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "あなたの決定は? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "本当にこの鍵を究極的に信用しますか? (y/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "究極的に信用した鍵への証明書:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr "%s: この鍵が本当に本人のものである、という兆候が、ありません\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr "%s: この鍵が本当に本人のものである、という兆候が、少ししかありません\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "この鍵はたぶん本人のものです\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "この鍵は自分のものです\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -5855,110 -4698,85 +5998,110 @@@ msgstr "
"ません。今から行うことを＊本当に＊理解していない場合には、\n"
"次の質問にはnoと答えてください。\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "それでもこの鍵を使いますか? (y/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "*警告*: 信用できない鍵を使っています!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "*警告*: この鍵は失効されたようです (失効鍵は不在)\n"
- #: g10/pkclist.c:546
++#: g10/pkclist.c:547
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "*警告*: この鍵は指名失効者によって失効されています!\n"
- #: g10/pkclist.c:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "*警告*: この鍵は所有者によって失効されています!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " 署名が偽物なこともある、ということです。\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "*警告*: この副鍵は所有者によって失効されています!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "注意: この鍵は使用禁止に設定されています。\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "注意: 確認された署名者のアドレスは'%s'です\n"
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "注意: 署名者のアドレス'%s'がDNSのエントリと一致しません\n"
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "PKA情報が有効のため、信用レベルがFULLに調整されました\n"
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "PKA情報が無効のため、信用レベルがNEVERに調整されました\n"
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "注意: この鍵は期限切れです!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "*警告*: この鍵は信用できる署名で証明されていません!\n"
- #: g10/pkclist.c:632
++#: g10/pkclist.c:633
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " この署名が所有者のものかどうかの検証手段がありません。\n"
- #: g10/pkclist.c:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "*警告*: この鍵は信用できません!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " この署名はおそらく 偽物 です。\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "*警告*: この鍵は十分に信用できる署名で証明されていません!\n"
- #: g10/pkclist.c:651
++#: g10/pkclist.c:652
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " この署名が所有者のものかどうか確信できません。\n"
- #: g10/pkclist.c:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: スキップ: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: スキップ: 公開鍵は使用禁止です\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: スキップ: 公開鍵はもうあります\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "ユーザIDを指定していません (\"-r\"を使いましょう) 。\n"
- #: g10/pkclist.c:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "今の受取人:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -5966,74 -4784,57 +6109,74 @@@ msgstr "
"\n"
"ユーザIDを入力。空行で終了: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "そのユーザIDはありません。\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "スキップ: 公開鍵はデフォルトの受取人としてもう設定済みです\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "公開鍵は使用禁止です。\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "スキップ: 公開鍵はもう設定済みです\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "デフォルトの受取人\"%s\"が不明です\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "有効な宛先がありません\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "注意: 鍵%sには %s の機能がありません\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "注意: 鍵%sには%sに対する優先指定がありません\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"データは保存されていません。保存には\"--output\"オプションを使ってください\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, c-format
msgid "error creating '%s': %s\n"
msgstr "'%s'の作成エラー: %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "分遣署名。\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "データ・ファイルの名前を入力: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "標準入力より読み込み中 ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "署名されたデータがありません\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "署名されたデータ'%s'が開けません\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "署名されたデータ fd=%d が開けません: %s\n"
@@@ -6070,8 -4864,6 +6213,8 @@@ msgstr "*注意*: 秘密鍵%sは%sで�
msgid "Note: key has been revoked"
msgstr "*注意*: 鍵は失効済みです"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet に失敗しました: %s\n"
@@@ -6081,41 -4872,37 +6224,47 @@@
msgid "key %s has no user IDs\n"
msgstr "鍵%sにはユーザIDがありません\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "失効者:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(これは、機密指定の失効鍵です)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "秘密鍵が使用できます。\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "この鍵に対する指名失効証明書を作成しますか? (y/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "ASCII外装出力を強制します。\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet に失敗しました: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "失効証明書を作成。\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "\"%s\"用の失効鍵が見つかりません\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "これは失効証明書でこちらのOpenPGP鍵に対するものです:"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6126,7 -4913,6 +6275,7 @@@ msgstr "
"しかし、秘密鍵がまだアクセス可能である場合、新しい失効証明書を生成し、\n"
"失効の理由をつける方がよいでしょう。"
- #: g10/revoke.c:564
++#: g10/revoke.c:572
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"
@@@ -6136,11 -4922,21 +6285,25 @@@ msgstr "
"入されます。\n"
"この失効証明書を使う前にはテクスト・エディタでこのコロンを削除してください。"
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "この鍵に対する失効証明書を作成しますか? (y/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6161,33 -4957,26 +6324,33 @@@ msgstr "
"る\n"
"場所にデータをおくことがあります!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "失効の理由を選択してください:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "キャンセル"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(ここではたぶん%dを選びたいでしょう)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "予備の説明を入力。空行で終了:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "失効理由: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(説明はありません)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "よろしいですか? (y/N) "
@@@ -6211,68 -4996,55 +6374,68 @@@ msgid "%s key %s requires a %zu bit or
msgstr ""
"%s鍵%sは%zuビットあるいはより大きいハッシュを必要とします(今のハッシュは%s)\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "*警告*: 署名のダイジェストが、メッセージと衝突します\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "*警告*: 署名副鍵%sは、相互証明されてません\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "詳細は%sをご覧ください\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "*警告*: 無効な相互証明が、署名副鍵%sにあります\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "公開鍵%sは、署名よりも%lu秒新しいものです\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "公開鍵%sは、署名よりも%lu秒新しいものです\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr "鍵%sは%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr "鍵%sは%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "*注意*: 署名鍵%sは%sに期限切れとなります\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "*注意*: 鍵 %s は失効済みです\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "不明のクリティカル・ビットにより、鍵%sの署名を不正とみなします\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "鍵%s: 副鍵失効署名にたいする副鍵がありません\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "鍵%s: 副鍵対応への署名にたいする副鍵がありません\n"
@@@ -6312,31 -5078,25 +6475,31 @@@ msgstr "
msgid "signing:"
msgstr "署名:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s暗号化を使用します\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"セキュアでないというフラグが鍵には設定されていません。\n"
"偽物乱数生成器とはいっしょに使えません!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\"をスキップします: 重複\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "スキップ: 秘密鍵はもうあります\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "これはPGPの生成したElgamal鍵で、署名用には安全ではありません!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "信用レコード%lu, 型%d: 書き込みに失敗しました: %s\n"
@@@ -6381,7 -5133,6 +6544,7 @@@ msgstr "'%s'で信用レコードの検
msgid "read error in '%s': %s\n"
msgstr "'%s'で読み込みエラー: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "信用データベース: 同期に失敗しました: %s\n"
@@@ -6410,7 -5156,6 +6573,7 @@@ msgstr "信用データベース レコ
msgid "trustdb transaction too large\n"
msgstr "信用データベースのトランザクションが大きすぎます\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "'%s'にアクセスできません: %s\n"
@@@ -6524,117 -5246,93 +6687,117 @@@ msgstr "%d文字以上の長さのテ�
msgid "input line longer than %d characters\n"
msgstr "入力行の長さが%d文字を超えています\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s'は、有効な大型鍵IDでありません\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "鍵%s: 信用する鍵として受理しました\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "鍵%sが信用データベースに複数あります\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "鍵%s: 信用される鍵の公開鍵がありません - スキップします\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "鍵%sを究極的に信用するよう記録しました\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "信用レコード%lu, リクエスト型%d: 読み込みに失敗しました: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "信用レコード%luが要求された型%dではありません\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "trustdbを下記のコマンドで再生成することを試すことができます:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "もし、それがうまくいかなかったら、マニュアルをご覧ください\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "不明の信用モデル (%d) は使えません - %s信用モデルを仮定\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "%s信用モデルを使用\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "信用データベースの検査は、不要です\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "次回の信用データベース検査は、%sです\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "信用モデル'%s'で信用データベースの検査は、不要です\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "信用モデル'%s'で信用データベースの更新は、不要です\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "公開鍵%sが見つかりません: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "--check-trustdbを実行してください\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "信用データベースの検査\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d本の鍵を処理 (うち%d本の有効性数をクリア)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "究極的に信用する鍵が見つかりません\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "究極的に信用する鍵%sの公開鍵が見つかりません\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "'まぁまぁの信用'%d、'全面的信用'%d、%s信用モデル\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr "深さ: %d 有効性: %3d 署名: %3d 信用: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -6868,11 -5517,9 +7031,11 @@@ msgstr "CHV%dのPINが短すぎます�
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%dの認証に失敗しました: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "カードからCHVステイタスの取得でエラー\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "カードが永久にロックされてます!\n"
@@@ -7001,12 -5620,10 +7164,12 @@@ msgstr "カードはダイジェスト�
msgid "signatures created so far: %lu\n"
msgstr "これまでに作成された署名: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "管理者PINの確認はこのコマンドでは今のところ禁止されています\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%sにアクセスできません - 無効なOpenPGPカード?\n"
@@@ -7026,7 -5640,6 +7189,7 @@@ msgstr "|N|初期の新しいPIN
msgid "run in multi server mode (foreground)"
msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
@@@ -7084,12 -5685,10 +7247,12 @@@ msgstr "
"'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
"い\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %dのハンドラが開始されました\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %dのハンドラが終了しました\n"
@@@ -7504,7 -6011,6 +7667,7 @@@ msgstr "行 %d: keygrip'%s'から鍵の
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "行 %d: 鍵の生成に失敗しました: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8083,7 -6469,6 +8246,7 @@@ msgstr "永続的にロードされる�
msgid " runtime cached certificates: %u\n"
msgstr "実行時キャッシュ証明書の数: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
msgid "certificate already cached\n"
msgstr " すでにキャッシュされた証明書\n"
@@@ -8091,8 -6475,6 +8254,8 @@@
msgid "certificate cached\n"
msgstr "キャッシュされた証明書\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, c-format
msgid "error caching certificate: %s\n"
msgstr "証明書のキャッシュのエラー: %s\n"
@@@ -8151,7 -6522,6 +8314,7 @@@ msgstr "キャッシュ・ファイル
msgid "not removing file '%s'\n"
msgstr "ファイル'%s'を削除しません\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, c-format
msgid "error closing cache file: %s\n"
msgstr "キャッシュ・ファイルでクローズのエラー: %s\n"
@@@ -8373,151 -6699,121 +8536,151 @@@ msgstr "S/N %sは有効です。CRLに�
msgid "error getting data from cache file: %s\n"
msgstr "キャッシュ・ファイルからデータの取得エラー: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "不明なハッシュ・アルゴリズム'%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr "アルゴリズム%dのgcry_md_openが失敗: %s\n"
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr "libksbaから無効なS-式を取得しました\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, c-format
msgid "converting S-expression failed: %s\n"
msgstr "S式の変換に失敗しました: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "S式の作成に失敗しました: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, c-format
msgid "ksba_crl_parse failed: %s\n"
msgstr "ksba_crl_parse に失敗しました: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "CRLの更新時刻の取得エラー: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr "このCRLの更新時刻: これ=%s 次=%s\n"
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr "nextUpdateが与えられていません。一日の有効期間を仮定します\n"
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, c-format
msgid "error getting CRL item: %s\n"
msgstr "CRL項目の取得エラー: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "一時キャッシュ・ファイルに項目の挿入エラー: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "CRLに発行者がありません: %s\n"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr "CRL発行証明書をauthorityKeyIdentifierで見つけます\n"
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, c-format
msgid "CRL signature verification failed: %s\n"
msgstr "CRL署名の検証に失敗しました: %s\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "CRL発行者証明書の検証検査エラ−: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "ksba_crl_new が失敗しました: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "ksba_crl_set_reader が失敗しました: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "古い一時キャッシュ・ファイル'%s'を削除しました\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "古い一時キャッシュ・ファイル'%s'が削除の問題: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "一時キャッシュ・ファイル'%s'の作成エラー: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, c-format
msgid "crl_parse_insert failed: %s\n"
msgstr "crl_parse_insert が失敗しました: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "一時キャッシュ・ファイル'%s'の終了エラー: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "一時キャッシュ・ファイル'%s'のクローズ・エラー: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
"**警告**: 新しいCRLはまだ古すぎます。%sに期限がきています - それでも読み込み"
"ます\n"
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr "新しいCRLはまだ古すぎます。%sに期限がきています\n"
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr "不明のクリティカルCRLの拡張 %s\n"
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "CRL拡張の読み込みエラー: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, c-format
msgid "creating cache file '%s'\n"
msgstr "キャッシュ・ファイル'%s'の作成\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "'%s'から'%s'へ名前変更の問題: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
@@@ -8525,64 -6821,51 +8688,64 @@@ msgstr "
"DIRファイルの更新の失敗 - キャッシュ・エントリは次のプログラムの開始で失われ"
"ます\n"
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr "CRLダンプの開始 (%s から取得)\n"
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr "*エラー*: CRLは使用されません。更新後でも、古すぎるからです!\n"
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr "*エラー*: CRLは不明なクリティカル拡張のため使用されません!\n"
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr "*エラー*: CRLは使用されません\n"
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr "*エラー*: このキャッシュされたCRLは変更されているかもしれません!\n"
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
msgid " WARNING: invalid cache record length\n"
msgstr "*警告*: 無効なキャッシュ・レコード長\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, c-format
msgid "problem reading cache record: %s\n"
msgstr "キャッシュ・レコードの読み込みの問題: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, c-format
msgid "problem reading cache key: %s\n"
msgstr "キャッシュ鍵の再読み込みの問題: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "dbからキャッシュ・エントリの読み込みエラー: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr "CRLダンプの終了\n"
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "DPからcrl_fetchが失敗しました: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "DPからcrl_cache_insertが失敗しました: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "発行者からcrl_cache_insertが失敗しました: %s\n"
@@@ -8626,68 -6899,52 +8789,68 @@@ msgstr "'%s'を取得する際のエラ
msgid "error retrieving '%s': http status %u\n"
msgstr "'%s'の取得エラー: httpステイタス %u\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- #| msgid "CRL access not possible due to disabled %s\n"
- msgid "CRL access not possible due to TOR mode\n"
- msgstr "CRLアクセスは停止された%sのため不可能です\n"
+ #| msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
+ msgstr "CRLアクセスはTORモードのため不可能です\n"
+#: dirmngr/crlfetch.c:386
#, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "禁止されているため、証明書の探索ができません: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr "OCSPをCRLの代わりに使います"
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr "dirmngrが動いているかどうか確認します"
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
msgid "add a certificate to the cache"
msgstr "証明書をキャッシュに追加します"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
msgid "validate a certificate"
msgstr "証明書を検証する"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
msgid "lookup a certificate"
msgstr "証明書を探索する"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
msgid "lookup only locally stored certificates"
msgstr "ローカルに保持された証明書だけを探索します"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr "--lookupにはURLがきます"
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr "dirmngrにCRLをロードする"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr "Squidのための特別なモード"
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
msgid "expect certificates in PEM format"
msgstr "証明書はPEM形式を期待します"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
msgstr "デフォルトOCSP応答の使用を強制します"
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
"使い方: dirmngr-client [オプション] [証明書ファイル|パターン] (ヘルプは -h)\n"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -8699,214 -6956,145 +8862,189 @@@ msgstr "
"プロセスは証明書が有効の場合、0を返し、有効でない場合、1 を返す。\n"
"一般の失敗の場合、そのほかのエラーコードを返す\n"
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "stdinから証明書読み込みエラー: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "'%s'から証明書の読み込みエラー: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr "証明書は意味のあるものとしては大きすぎます\n"
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, c-format
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "dirmngrへ接続できません: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, c-format
msgid "lookup failed: %s\n"
msgstr "検索に失敗しました: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "CRL'%s'の読み込みが失敗しました: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr "dirmngr daemonが起動され動いています\n"
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "証明書の検証に失敗しました: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
msgid "certificate is valid\n"
msgstr "証明書は正しいです\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
msgid "certificate has been revoked\n"
msgstr "証明書は失効済みです\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, c-format
msgid "certificate check failed: %s\n"
msgstr "証明書の検査に失敗しました: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr "ステイタス'%s'を取得しました\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "base64エンコーディングの書き込みエラー: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "assuanコンテクストの確保に失敗しました: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr "あきらかにdirmngrが動いていません\n"
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr "dirmngrが動いていません - 開始します\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr "環境変数%sが破壊されています\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "dirmngrプロトコル・バージョン%dはサポートされていません\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "dirmngrに接続できません - フォールバックを試します\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "dirmngrへ接続できません: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "サポートされていない問い合わせ: '%s'\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr "絶対ファイル名がきます\n"
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr "'%s'を検索します\n"
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr "ウィンドウズ・サービスとして実行 (バックグラウンド)"
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr "CRLキャッシュの内容をリストします"
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|FILEからCRLをキャッシュにロードする"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|URLからCRLを取得します"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr "dirmngrをシャットダウンする"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr "キャッシュをフラッシュします"
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|FILEにサーバ・モードのログを書き出す"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
msgid "run without asking a user"
msgstr "ユーザに問い合わせせずに実行"
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr "期日の過ぎたCRLのロードを強制する"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr "OCSP要求の送信を認める"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr "HTTPの使用を禁止する"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr "LDAPの使用を禁止する"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr "HTTP CRL配布ポイントを無視する"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr "LDAP CRL配布ポイントを無視する"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr "OCSPサービスURLに入っている証明書を無視する"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|すべてのHTTPリクエストをURLにリダイレクトする"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|LDAPの問い合わせにHOSTを使う"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "--ldap-proxy にフォールバック・ホストを使わない"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|FILEからLDAPサーバリストを読み込みます"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "CRL配布ポイントに発見された新しいサーバを serverlist に追加する"
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|LDAPのタイムアウトをN秒とする"
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|OCSP応答としてURLを使用"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|FPRで署名されたOCSPレスポンス"
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
- msgstr ""
++#: dirmngr/dirmngr.c:224
+ #, fuzzy
+ #| msgid "route all network traffic via TOR"
+ msgid "route all network traffic via Tor"
+ msgstr "ネットワーク・トラフィックをすべてTOR経由にする"
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -8915,11 -7103,9 +9053,11 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "使い方: @DIRMNGR@ [オプション] (ヘルプは -h)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -8927,77 -7113,60 +9065,77 @@@ msgstr "
"形式: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の鍵サーバ、CRLとOCSPアクセス\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "有効なdebugレベルは: %s\n"
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, c-format
msgid "usage: %s [options] "
msgstr "使い方: %s [オプション] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
msgid "colons are not allowed in the socket name\n"
msgstr "コロンはソケット名に許されません\n"
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの取得の失敗: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの処理に失敗: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: 行が長すぎます - スキップされました\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: 無効なフィンガープリントが検出されました\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: 読み込みエラー: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: 行末のゴミを無視\n"
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "SIGHUPを受け取り - 設定を読み直し、キャッシュをフラッシュ\n"
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2を受け取り - 動作は定義されない\n"
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERMを受け取り - シャットダウン...\n"
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERMを受け取り - %d本のアクティブな接続がまだあります\n"
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
msgid "shutdown forced\n"
msgstr "強制的にシャットダウンする\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINTを受け取り - すぐにシャットダウン\n"
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "シグナル%dを受け取り - アクションは定義されない\n"
@@@ -9238,12 -7356,10 +9376,12 @@@ msgstr "'%s:%d'をLDAPサーバ・リ�
msgid "malloc failed: %s\n"
msgstr "mallocが失敗しました: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: 無効なパターン '%s'\n"
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search がサーバのサイズ限界を越えました\n"
@@@ -9275,13 -7385,11 +9413,13 @@@ msgstr "応答からの読み込みエ�
msgid "response from server too large; limit is %d bytes\n"
msgstr "サーバからの応答がが長すぎます (上限%dバイト)。\n"
+#: dirmngr/ocsp.c:139
#, fuzzy
- #| msgid "OCSP request not possible due to disabled HTTP\n"
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr "HTTPが停止されているためOCSPリクエストが不可能です\n"
+ #| msgid "OCSP request not possible due to TOR mode\n"
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "TORモードのためOCSPリクエストが不可能です\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr "HTTPが停止されているためOCSPリクエストが不可能です\n"
@@@ -9424,71 -7502,60 +9562,76 @@@ msgstr "OSCPレスポンダは現在で
msgid "OCSP responder returned an too old status\n"
msgstr "OSCPレスポンダは古すぎるステイタスを返しました\n"
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s)が失敗しました: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr "ldapserverがありません"
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr "serialnoがcert IDにありません"
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquireに失敗しました: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url が失敗しました: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, c-format
msgid "error sending data: %s\n"
msgstr "データ送信エラー: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch が失敗しました: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert が失敗しました: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d を越えました\n"
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "制御構造を確保できません: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "assuanコンテクストの確保に失敗しました: %s\n"
+
++#: dirmngr/server.c:2430
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "サーバの初期化に失敗しました: %s\n"
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "Assuanで登録コマンドに失敗しました: %s\n"
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept の問題: %s\n"
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuanの処理が失敗しました: %s\n"
@@@ -9733,13 -7740,11 +9876,13 @@@ msgstr "出力フォーマットを制�
msgid "Options controlling the interactivity and enforcement"
msgstr "インタラクティビティと強制を制御するオプション"
+#: tools/gpgconf-comp.c:911
#, fuzzy
- #| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
- msgstr "セキュリティを制御するオプション"
+ #| msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
+ msgstr "TORの使用を制御するオプション"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "HTTPサーバのコンフィグレーション"
@@@ -9775,11 -7772,9 +9918,11 @@@ msgstr "スマートカード・デー�
msgid "GPG for S/MIME"
msgstr "S/MIME のためのGPG"
+#: tools/gpgconf-comp.c:1063
msgid "Key Acquirer"
- msgstr ""
+ msgstr "キー取得プログラム"
+#: tools/gpgconf-comp.c:1064
msgid "PIN and Passphrase Entry"
msgstr "PINとパスフレーズの入力"
diff --cc po/nb.gmo
index 50d49dc,0000000..0eb34e8
mode 100644,000000..100644
Binary files differ
diff --cc po/nb.po
index 7071ff0,09f792b..0d0f6e2
--- a/po/nb.po
+++ b/po/nb.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.3\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2015-02-11 19:18+0100\n"
"Last-Translator: Trond Endrest�l <Trond.Endrestol at fagskolen.gjovik.no>\n"
"Language-Team: Norwegian Bokm�l <i18n-nb at lister.ping.uio.no>\n"
@@@ -72,7 -61,6 +72,7 @@@ msgstr "ugyldig passfrase
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
#, fuzzy
msgid "Quality:"
msgstr "gyldighet: %s"
@@@ -83,74 -71,58 +83,74 @@@
#. 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:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "ugyldig passfrase"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "for lang linje"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "for lang linje"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Ugyldig tegn i navn\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "ugyldig MPI"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "ugyldig passfrase"
@@@ -160,25 -131,11 +160,25 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "kan ikke opprette �%s�: %s\n"
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -253,14 -197,12 +253,14 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "klarte ikke � lagre n�kkelen: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
#, fuzzy
msgid "Please insert the card with serial number"
msgstr ""
"Vennligst fjern det n�v�rende kortet og sett inn kortet med serienummeret:\n"
" %.*s\n"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
#, fuzzy
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -406,42 -322,28 +406,42 @@@ msgstr "
"Valg:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "fyldig output"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "v�re noenlunde stille"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "leser valg fra �%s�\n"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -521,11 -406,6 +521,11 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Vennligst rapporter feil til <gnupg-bugs at gnu.org>.\n"
@@@ -541,144 -419,106 +541,143 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "MERK: ingen standard valgfil �%s�\n"
- #: agent/gpg-agent.c:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "valgfil �%s�: %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "leser valg fra �%s�\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr ""
- #: agent/gpg-agent.c:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke opprette �%s�: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
- #: agent/gpg-agent.c:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "feil ved henting av ny PIN: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "skriver hemmelig n�kkel til �%s�\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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 opprette katalogen �%s�: %s\n"
- #: agent/gpg-agent.c:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "katalogen �%s� ble opprettet\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) mislyktes in %s: %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "kan ikke opprette katalogen �%s�: %s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "oppdatering av hemmelig mislyktes: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: hoppet over: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr ""
@@@ -693,8 -531,6 +692,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -702,9 -538,6 +701,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -755,7 -580,6 +754,7 @@@ msgstr "cancel|cancel
msgid "error while asking for the passphrase: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "feil med �%s�: %s\n"
@@@ -937,8 -727,6 +936,8 @@@ msgstr "feil ved opprettelse av passfra
msgid "error creating a stream for a pipe: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
@@@ -1087,7 -843,6 +1086,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1107,7 -859,6 +1106,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1400,7 -1091,6 +1399,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "ikke tvunget"
@@@ -1579,19 -1231,14 +1578,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "Tast inn passfrase: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnummer %s oppdaget\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "kan ikke gj�re dette i batchmodus\n"
@@@ -1604,210 -1249,159 +1603,210 @@@ msgstr "Denne kommandoen er ikke tillat
msgid "Reset Code not or not anymore available\n"
msgstr ""
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ditt valg? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[ikke satt]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "mann"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "dame"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "uspesifisert"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "ikke tvunget"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "tvunget"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Kortholders etternavn: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Kortholders fornavn: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Feil: Det kombinerte navnet er for langt (grensa g�r ved %d tegn).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "URL for � hente offentlig n�kkel: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Logindata (kontonavn): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Feil: Logindata er for langt (grensa g�r ved %d tegn).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Privat DO-data: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Spr�kpreferanser:"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Feil: ugyldig respons.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "CA-fingeravtrykk: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "n�kkeloperasjonen er umulig: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "ikke et OpenPGP-kort"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Erstatte eksisterende n�kkel? (j/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rundet opp til %u bits\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Erstatte eksisterende n�kler? (j/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1822,143 -1416,108 +1821,143 @@@ msgstr "
" PIN = �%s� Admin PIN = �%s�\n"
"Du b�r endre dem med kommandoen --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Signaturn�kkel\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Krypteringsn�kkel\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsn�kkel\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Ugyldig valg.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Signere den? (j/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "avslutte denne menyen"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "vise admin-kommandoer"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "vise denne hjelpen"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "vis alle tilgjengelige data"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "endre kortholders navn"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "endre URL for � hente n�kkel"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "hente n�kkelen angitt i URL som er lagret i kortet"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "endre loginnavnet"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "endre spr�kpreferansene"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "endre kortholders kj�nn"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "vise et CA-fingeravtrykk"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "veksle tving-signatur-PIN-flagget"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "generere nye n�kler"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "meny for � endre eller fjerne blokkering av PIN"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "bekrefte PIN og vise alle data"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "Admin-reservert kommando\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Admin-kommandoer er tillatt\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Admin-kommandoer er ikke tillatt\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Ugyldig kommando (pr�v �help�)\n"
@@@ -1966,77 -1524,64 +1965,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output virker ikke for denne kommandoen\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan ikke �pne �%s�\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "feil ved lesing av n�kkelblokk: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(med mindre du angir n�kkelen ved hjelp av fingeravtrykk)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "kan ikke gj�re dette i batchmode uten �--yes�\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Slette denne n�kkelen fra n�kkelknippet? (j/N)"
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Dette er en hemmelig n�kkel! - virkelig slette den? (j/N)"
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "bad key"
msgid "key"
msgstr "ugyldig n�kkel"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Offentlig n�kkel: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "nullstilt informasjon om eiertillit\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "det finnes en hemmelig n�kkel for offentlig n�kkel �%s�!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
@@@ -2091,7 -1628,6 +2097,7 @@@ msgid "forcing symmetric cipher %s (%d
msgstr ""
"p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "du kan ikke bruke %s i %s modus\n"
@@@ -2180,280 -1700,233 +2186,300 @@@ msgstr "ADVARSEL: klarte ikke � fjerne
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "ADVARSEL: klarte ikke � fjerne midlertidig katalog �%s�: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "eksportere signaturer som er markert som bare-lokale"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr ""
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "n�kkel %s: PGP 2.x-aktig n�kkel - hoppet over\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "n�kkel %s: n�kkelmateriell p� kort - hoppet over\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: hoppet over: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: ingenting eksportert\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[Brukerid ikke funnet]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "CA-fingeravtrykk: "
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "ugyldige listevalg\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "unusable secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "ubrukelig hemmelig n�kkel"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "|[fil]|lage en signatur"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fil]|lage en klartekstsignatur"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "lage en adskilt signatur"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "kryptere data"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "kryptering med bare symmetrisk cipher"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "dekryptere data (standard)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "bekrefte en signatur"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "liste n�kler"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "liste n�kler og signaturer"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "vise og sjekke n�kkelsignaturer"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "liste n�kler og fingeravtrykk"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "liste hemmelige n�kler"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "generere et nytt n�kkelpar"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generere et nytt n�kkelpar"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generere et nytt n�kkelpar"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "generere et opphevingssertifikat"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signere en n�kkel"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signere en n�kkel lokalt"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "signere en n�kkel"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "signere en n�kkel lokalt"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "signere eller redigere en n�kkel"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "endre passfrasen"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "eksportere n�kler"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "eksportere n�kler til en n�kkelserver"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importere n�kler fra en n�kkelserver"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "s�ke etter n�kler p� en n�kkelserver"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "oppdatere alle n�klene fra en n�kkelserver"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importere/flette n�kler"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "vis kortets status"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "endre data p� et kort"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "endre PIN p� et kort"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "oppdatere tillitsdatabasen"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [filer]|skrive meldingsdigester"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "lage ASCII-beskyttet output"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAVN|kryptere for NAVN"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "bruke denne brukeriden for signering eller dekryptering"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "bruk kanonisk tekstmodus"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "leser valg fra �%s�\n"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "ikke gj�r noen endringer"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "sp�r f�r overskriving"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "bruk streng OpenPGP-oppf�rsel"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2461,7 -1934,6 +2487,7 @@@ msgstr "
"@\n"
"(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2481,13 -1953,11 +2507,13 @@@ msgstr "
" --list-keys [navn] vise n�kler\n"
" --fingerprint [navn] vise fingeravtrykk\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2502,7 -1972,6 +2528,7 @@@ msgstr "
"signere, sjekke, kryptere eller dekryptere\n"
"standard operasjon avhenger av inputdata\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2510,74 -1979,60 +2536,74 @@@ msgstr "
"\n"
"St�ttede algoritmer:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Offentlig n�kkel: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Kompresjon: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "bruksm�te: gpg [valg] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2585,7 -2040,6 +2611,7 @@@ msgstr "
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen "
"�%s�\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2595,14 -2049,12 +2621,14 @@@ msgstr "
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
"�%s�\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, 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: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2610,7 -2062,6 +2636,7 @@@ msgstr "
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
"�%s�\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2621,494 -2072,439 +2647,560 @@@ msgstr "
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
"konfigurasjonsfilen �%s�\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, 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: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "ukjent konfigurasjonspunkt �%s�\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
#| msgid "show the keyring name in key listings"
msgid "show key usage information during key listings"
msgstr "vise navnet til n�kkelknippene i n�kkellister"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr ""
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "vise navnet til n�kkelknippene i n�kkellister"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr ""
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "utkoble en n�kkel"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option `%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "ukjent valg �%s�\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "ukjent valg �%s�\n"
+
++#: g10/gpg.c:2085
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
- #: g10/gpg.c:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "MERK: %s er ikke for vanlig bruk!\n"
# Tenk litt p� denne du, Trond.
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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 en gyldig signaturutg�else\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "ugyldig hashalgoritme �%s�\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, 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 gyldig tegnsett\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke parse n�kkelserverens URL\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "ugyldige valg for n�kkelserver\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importvalg\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "ugyldige importvalg\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportvalg\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "ugyldige eksportvalg\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listevalg\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "ugyldige listevalg\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr ""
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr ""
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr ""
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige valg for bekreftelse\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "ugyldige valg for bekreftelse\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke sette exec-path til %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s er ikke tillatt sammen med %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er ikke fornuftig med %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr ""
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "valg digestalgoritme er ugyldig\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "valgt kompresjonsalgoritme er ugyldig\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m� v�re st�rre enn 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neede m� v�re st�rre enn 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "ugyldig standard preferanser\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "ugyldig personlig cipherpreferanser\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "ugyldig personlig digestpreferanser\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "ugyldig personlig kompresjonspreferanser\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker ikke enn� med %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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 kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
- #: g10/gpg.c:3497
++#: g10/gpg.c:3868
#, 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 kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
- #: g10/gpg.c:3502
++#: g10/gpg.c:3873
#, 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 kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
- #: g10/gpg.c:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "ugyldig hashalgoritme �%s�\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "ugyldig hashalgoritme �%s�\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
#| msgid "symmetric encryption of `%s' failed: %s\n"
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
- #: g10/gpg.c:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key brukerid"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key brukerid"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key brukerid [kommandoer]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key brukerid"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sending til n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "mottak fra n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "n�kkeleksport mislyktes: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "s�k p� n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "refresh p� n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ugyldig hashalgoritme �%s�\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Sett i gang og tast inn meldingen din ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "hent n�klene fra dette n�kkelknippet"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|skrive statusinfo til denne FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3282,7 -2644,6 +3374,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "n�kkel %s: ingen brukerid\n"
@@@ -3293,7 -2653,6 +3385,7 @@@
msgid "key %s: %s\n"
msgstr "hoppet over �%s�: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3316,7 -2671,6 +3408,7 @@@ msgstr "n�kkel %s: ingen gyldig brukeri
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes en manglende selvsignatur\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
@@@ -3326,258 -2679,221 +3418,273 @@@
msgid "key %s: new key - skipped\n"
msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "skriver til �%s�\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, 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:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "n�kkel %s: kan ikke finne original n�kkelblokk: %s\n"
- #: g10/import.c:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "n�kkel %s: kan ikke lese original n�kkelblokk: %s\n"
- #: g10/import.c:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "n�kkel %s: �%s� %d nye brukerider\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "n�kkel %s: �%s� 1 ny signatur\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "n�kkel %s: �%s� %d nye brukerider\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "n�kkel %s: �%s� %d nye brukerider\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "n�kkel %s: �%s� ikke endret\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "n�kkel %s: hemmelig n�kkel importert\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, fuzzy, c-format
#| msgid "key %s: secret key imported\n"
msgid "key %s: secret key already exists\n"
msgstr "n�kkel %s: hemmelig n�kkel importert\n"
- #: g10/import.c:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "import av hemmelig n�kkel er ikke tillatt\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"n�kkel %s: ingen offentlig n�kkel - kan ikke anvende opphevingssertifikat\n"
- #: g10/import.c:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "n�kkel %s: ingen brukerid for signatur\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme for brukerid �%s�\n"
- #: g10/import.c:1979
++#: g10/import.c:2021
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "n�kkel %s: ugyldig selvsignatur for brukerid �%s�\n"
- #: g10/import.c:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "n�kkel %s: hoppet over undern�kkel\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
@@@ -3604,62 -2916,53 +3711,67 @@@ msgstr "n�kkelknippet �%s� ble opprette
msgid "keyring '%s' created\n"
msgstr "n�kkelknippet �%s� ble opprettet\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "n�kkelblokkressurs �%s�: %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "feil med �%s�: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr ""
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[oppheving]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[selvsignatur]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 ubrukelig signatur\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d ubrukelige signaturer\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signaturer ble ikke sjekket p� grunn av manglende n�kler\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 signatur ble ikke sjekket p� grunn av en feil\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signaturer ble ikke sjekket p� grunn av feil\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 brukerid uten gyldig selvsignatur ble oppdaget\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3670,62 -2973,52 +3782,67 @@@ msgstr "
"andre brukeres n�kler (ved � se p� pass, sjekke fingeravtrykk fra\n"
"forskjellige kilder, osv.)\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Jeg stoler marginalt\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Jeg stoler fullt\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Brukerid �%s� er opphevet."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Er du fortsatt sikker p� at du vil signerere den? (j/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Kunne ikke signere.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Brukerid �%s� er utg�tt."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Brukeriden �%s� er ikke selvsignert."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Brukeriden �%s� er signerbar."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Signere den? (j/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3734,11 -3027,9 +3851,11 @@@ msgstr "
"Selvsignaturen p� �%s�\n"
"er en PGP 2.x-aktig signatur.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3747,11 -3038,9 +3864,11 @@@ msgstr "
"Din n�v�rende signatur p� �%s�\n"
"er utg�tt.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Vil du utstede en ny signatur for � erstatte den som er utg�tt? (j/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3760,43 -3049,34 +3877,43 @@@ msgstr "
"Din n�v�rede signatur p� �%s�\n"
"er en lokal signatur.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "�%s� var allerede lokalt signert av n�kkelen %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "�%s� var allerede signert av n�kkelen %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Vil du likevel signere den igjen? (j/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Ingenting � signere med n�kkelen %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Denne n�kkelen er utg�tt!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Denne n�kkelen utg�r den %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Vil du at signaturen skal utg� p� samme tidspunkt? (J/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3806,33 -3086,27 +3923,33 @@@ msgstr "
"tilh�rer den overnevnte personen? Tast inn �0� dersom du ikke vet\n"
"svaret.\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jeg vil ikke svare.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Jeg har ikke sjekket i det hele tatt.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jeg har gjort en vanlig sjekk.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Jeg har sjekket veldig n�ye.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Ditt valg? (angi �?� for mer informasjon): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3841,225 -3115,170 +3958,225 @@@ msgstr "
"Er du virkelig sikker p� at du vil signerere denne n�kkelen med din\n"
"n�kkel �%s� (%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Dette vil v�re en selvsignatur.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-eksporterbar.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-opphevbar.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "Signaturen vil bli markert som ikke-eksporterbar.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "Signaturen vil bli markert som ikke-opphevbar.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Jeg har ikke sjekket denne n�kkelen i det hele tatt.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "Jeg har sjekket denne n�kkelen p� vanlig m�te.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Virkelig signere? (j/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "flytter en n�kkelsignatur til den rette plassen\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "lagre og avslutte"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "vise n�kkelens fingeravtrykk"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
#| msgid "show this help"
msgid "show the keygrip"
msgstr "vise denne hjelpen"
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "liste n�kler og brukerider"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "velger brukerid N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "velger brukerid N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "sjekke signaturer"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "signerere utvalgte brukerider lokalt"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "signere utvalgte brukerider med en tillitssignatur"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "legge til en brukerid"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "legge til en fotoid"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "slette utvalgte brukerider"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "legge til en undern�kkel"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "slette utvalgte undern�kler"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "legge til en opphevingsn�kkel"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "slette signaturene fra de utvalgte brukeridene"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "markere den valgte brukeriden som den prim�re"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "liste preferanser (ekspert)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "liste preferanser (fyldig)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "sette preferanseliste for de valgte brukeridene"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "sette URL for foretrukket n�kkelserver for de valgte brukeridene"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "sette en notasjon for de valgte brukeridene"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "endre passfrasen"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "endre eiertilliten"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "oppheve signaturene p� de valgte brukeridene"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "oppheve utvalgte brukerider"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "oppheve n�kkel eller utvalgte undern�kler"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "innkoble en n�kkel"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "utkoble en n�kkel"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "vise utvalgte fotoider"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Hemmelig n�kkel er tilgjengelig\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4067,546 -3286,436 +4184,560 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "N�kkelen er opphevet."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Virkelig signerere alle brukerider? (j/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Virkelig signerere alle brukerider? (j/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: Velg brukeriden som skal signeres\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Ukjent signaturtype �%s�\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Du m� velge minst en brukerid.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Du kan ikke slette den siste brukeriden!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Virkelig fjerne denne brukeriden? (j/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Du m� velge minst en n�kkel.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "Kan ikke �pne �%s�: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Du m� velge minst en n�kkel.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Virkelig oppheve denne brukeriden? (j/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Vil du virkelig oppheve hele n�kkelen? (j/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "sette preferanseliste til:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Virkelig oppdatere preferansene? (j/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Lagre endringene? (j/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Avslutte uten � lagre? (j/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
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:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ugyldig fingeravtrykk"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Det finnes ingen slik brukerid.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Ingenting � signere med n�kkelen %s\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "S�rtrekk: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Notasjoner: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(sensitiv)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "opprettet: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "opphevet: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "utgikk: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "utg�r: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "bruksm�te: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "tillit: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "gyldighet: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Denne n�kkelen har blitt utkoblet"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "opphevet"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "utg�tt"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
msgid "You may want to change its expiration date too.\n"
msgstr ""
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
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 ""
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Er du sikker p� at du vil legge den til? (j/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Slette denne gode signaturen? (j/N/a)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr ""
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr ""
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Slettet %d signatur.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Slettet %d signaturer.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Ingen ble slettet.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "ugyldig"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "brukerid �%s�: allerede renset\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "brukerid �%s�: allerede renset\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "brukerid �%s�: allerede renset\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
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 ""
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr ""
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr ""
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
"N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Vennligst velg minst en undern�kkel.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
+ "N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr ""
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr ""
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Undern�kkel %s er allerede opphevet.\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr ""
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Er du sikker p� at du vil slette den? (j/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr ""
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr ""
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr ""
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr ""
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "Nothing to sign with key %s\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Ingenting � signere med n�kkelen %s\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr ""
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr ""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (ikke-eksporterbar)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne signaturen utgikk den %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr ""
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr ""
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (ikke-opphevbar)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr ""
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr ""
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "ingen hemmelig n�kkel\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "brukerid �%s� er allerede opphevet\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "N�kkelen %s er allerede opphevet.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undern�kkel %s er allerede opphevet.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4647,14 -3748,10 +4778,14 @@@ msgstr "skriver selvsignatur\n
msgid "writing key binding signature\n"
msgstr "skriver n�kkelbindende signatur\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
@@@ -4949,41 -3997,36 +5080,46 @@@ msgstr "
msgid "Real name: "
msgstr "Fullt navn: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Ugyldig tegn i navn\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Navnet kan ikke starte med et siffer\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Navnet m� v�re minst 5 tegn langt\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Epostadresse: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Ugyldig tegn i kommentar\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Du bruker tegnsettet �%s�.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4994,7 -4037,6 +5130,7 @@@ msgstr "
" �%s�\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@@ -5010,35 -4052,28 +5146,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnKeEeRrAa"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Vennligst korriger feilen f�rst\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5046,7 -4081,6 +5182,7 @@@ msgstr "
"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@@ -5055,16 -4089,13 +5191,16 @@@ msgstr "
"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
"\n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5076,7 -4107,6 +5212,7 @@@ msgstr "
"hjelp av dette programmet og valget �--edit-key�.\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5088,12 -4118,10 +5224,12 @@@ msgstr "
"diskene jobbe) under primtallgenereringen; dette gir\n"
"tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "N�kkelgenerering mislyktes: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5101,59 -4129,48 +5237,59 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "n�kkel finnes allerede\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Bruke denne n�kkelen likevel? (j/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "generere en ny n�kkel\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "N�kkelgenereringen ble avbrutt.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "skriver offentlig n�kkel til �%s�\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5163,7 -4180,6 +5299,7 @@@ msgstr "
"sekund�rn�kkel for dette form�let.\n"
# Er dette entallsformen av denne strengen?
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5172,7 -4188,6 +5308,7 @@@ msgstr "
"klokkeproblem)\n"
# Er dette flertallsformen av denne og den forrige strengen?
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5180,7 -4195,6 +5316,7 @@@ msgstr "
"n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
"klokkeproblem)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
@@@ -5188,238 -4202,187 +5324,238 @@@ msgstr "
"MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
"OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Virkelig opprette? (j/N)"
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr ""
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr ""
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr ""
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr ""
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr ""
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr ""
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 ubrukelig signatur\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d ubrukelige signaturer\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "N�kkelknippe"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "hoppet over �%s�: %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Fingeravtrykk for prim�rn�kkel:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Fingeravtrykk for undern�kkel:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Fingeravtrykk for prim�rn�kkel:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Fingeravstrykk for undern�kkel:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " N�kkelfingeravtrykk ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " Serienummer for kort ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "cacher n�kkelknippet �%s�\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu n�kler cachet s� langt (%lu signaturer)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu n�kler cachet (%lu signaturer)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr ""
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "utkoblet"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "oppfrisker 1 n�kkel fra %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "oppfrisker %d n�kler fra %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "n�kkelen �%s� ble ikke funnet p� n�kkelserveren\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "ber om n�kkelen %s fra %s server %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "ber om n�kkel %s fra %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr ""
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "ber om n�kkel %s fra %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
@@@ -5455,7 -4412,6 +5591,7 @@@ msgstr "kryptert med %u-bit %s-n�kkel,
# Do we really need to translate this string.
# The must some bug in the code.
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " �%s�\n"
@@@ -5501,254 -4448,203 +5637,255 @@@ msgstr "
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr ""
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekryptering mislyktes: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "opprinnelig filnavn=�%.*s�\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "ingen signatur ble funnet\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "D�RLIG signatur fra �%s�"
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Utg�tt signatur fra �%s�"
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "God signatur fra �%s�"
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr ""
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr ""
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur opprettet %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " bruker %s n�kkel %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "N�kkel tilgjengelig ved: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " aka �%s�"
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Signatur utg�tt %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Signatur utg�r %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s signatur, digestalgoritme %s\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "bin�r"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "tekstmodus"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "ukjent"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "ukjent pubkey-algoritme"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr ""
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr ""
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr ""
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr ""
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
#| msgid "fstat(%d) failed in %s: %s\n"
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "fstat(%d) mislyktes in %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) mislyktes in %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "ADVARSEL: bruker eksperimentell offentlig n�kkel-algoritme %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s signatur, digestalgoritme %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr ""
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr ""
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr ""
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr ""
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr ""
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "flertydig valg �%s�\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "ukjent valg �%s�\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type `%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Ukjent signaturtype �%s�\n"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -5946,31 -4809,24 +6083,31 @@@ msgstr "
msgid "unable to display photo ID!\n"
msgstr ""
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Ingen grunn er angitt"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "N�kkelen er overg�tt"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "N�kkelen har blitt kompromittert"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "N�kkelen er ikke lengre i bruk"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Brukerid er ikke lengre gyldig"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "grunnen for opphevelse: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "kommentar til opphevelse: "
@@@ -5984,95 -4840,76 +6121,95 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Ingen tillitsverdi tilordnet til:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " aka �%s�\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"Hvor mye stoler du p� at denne n�kkelen faktisk tilh�rer den angitte "
"brukeren?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Jeg vet ikke eller vil ikke uttale meg\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Jeg stoler IKKE p� den\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Jeg stoler fullstendig p� den\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = tilbake til hovedmenyen\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = hopp over denne n�kkelen\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " q = avslutt\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Valget ditt? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Vil du virkelig sette denne n�kkelen til fullstendig tillit? (j/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Sertifikater som f�rer til en fullstendig betrodd n�kkel:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: Det finnes ingen indikasjon p� at denne n�kkelen faktisk tilh�rer den "
"angitte eieren\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: Det er begrenset indikasjon p� at denne n�kkelen faktisk tilh�rer den "
"angitte eieren\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Denne n�kkelen tilh�rer sannsynligvis den angitte eieren\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "denne n�kkelen tilh�rer oss\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6082,115 -4919,90 +6219,115 @@@ msgstr "
"brukeriden. Dersom du *virkelig* vet hva du gj�r, kan du besvare det\n"
"neste sp�rsm�let med ja.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "Bruke denne n�kkelen likevel? (j/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "ADVARSEL: Bruker ubetrodd n�kkel!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr ""
"ADVARSEL: Denne n�kkelen har blitt opphevet av den utpekte oppheveren!\n"
- #: g10/pkclist.c:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ADVARSEL: Denne n�kkelen har blitt opphevet av dens eier!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " Dette kan bety at signaturen er falsk.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ADVARSEL: Denne undern�kkelen har blitt opphevet av eieren!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Merk: Denne n�kkelen har blitt utkoblet.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Merk: Denne n�kkelen er utg�tt!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"ADVARSEL: Denne n�kkelen er ikke sertifisert med en betrodd signatur!\n"
- #: g10/pkclist.c:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ADVARSEL: Vi stoler IKKE p� denne n�kkelen!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen er sannsynligvis et FALSKNERI.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ADVARSEL: Denne n�kkelen er ikke sertifisert med tilstrekkelige betrodde "
"signaturer!\n"
- #: g10/pkclist.c:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppet over: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: hoppet over: offentlig n�kkel er allerede tilstede\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Du oppga ikke en brukerid. (Du kan bruke �-r�)\n"
- #: g10/pkclist.c:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6198,74 -5010,57 +6335,74 @@@ msgstr "
"\n"
"Tast inn brukeriden. Avslutt med en blank linje: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Det finnes ingen slik brukerid.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Offentlig n�kkel er utkoblet.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "hoppet over: offentlig n�kkel er allerede satt\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "ukjent standardmottaker �%s�\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "ingen gyldige adressater\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "n�kkel %s: ingen brukerid\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "n�kkel %s: ingen brukerid\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr ""
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr ""
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr ""
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr ""
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
msgid "can't open signed data '%s'\n"
msgstr "kan ikke �pne �%s�: %s\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan ikke �pne �%s�: %s\n"
@@@ -6305,8 -5093,6 +6442,8 @@@ msgstr "NOTIS: hemmelig n�kkel %s utgik
msgid "Note: key has been revoked"
msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr ""
@@@ -6316,43 -5101,39 +6453,49 @@@
msgid "key %s has no user IDs\n"
msgstr "n�kkel %s: ingen brukerid\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr ""
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr ""
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Hemmelig n�kkel er tilgjengelig\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Lage et utpekt opphevingssertifikat for denne n�kkelen? (j/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr ""
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr ""
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr ""
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6360,18 -5141,27 +6503,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6382,33 -5172,26 +6539,33 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr ""
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr ""
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Er dette i orden? (j/N) "
@@@ -6433,37 -5212,30 +6590,37 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr ""
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "vennligst se %s for mer informasjon\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr ""
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr ""
# Er dette entallsformen av denne strengen?
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6472,7 -5244,6 +6629,7 @@@ msgstr "
"klokkeproblem)\n"
# Er dette flertallsformen av denne og den forrige strengen?
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6480,28 -5251,23 +6637,28 @@@ msgstr "
"n�kkel %s ble opprettet %lu sekunder i fremtiden (time warp eller "
"klokkeproblem)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "n�kkel %s: ingen undern�kkel for undern�kkelopphevingssignatur\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
@@@ -6541,29 -5301,23 +6698,29 @@@ msgstr "
msgid "signing:"
msgstr ""
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr ""
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "hoppet over �%s�: er duplikat\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr ""
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr ""
@@@ -6609,7 -5355,6 +6766,7 @@@ msgstr "feil ved s�king etter tillitspo
msgid "read error in '%s': %s\n"
msgstr "lesefeil ved �%s�: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr ""
@@@ -6640,7 -5380,6 +6797,7 @@@ msgstr "
msgid "trustdb transaction too large\n"
msgstr ""
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -6756,118 -5472,94 +6913,118 @@@ msgstr "
msgid "input line longer than %d characters\n"
msgstr ""
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid character set\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "�%s� er ikke et gyldig tegnsett\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "n�kkel %s: godtatt som betrodd n�kkel\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr ""
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "n�kkel %s: ingen offentlig n�kkel for betrodd n�kkel - hoppet over\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "n�kkel %s markert som endelig betrodd.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr ""
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr ""
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr ""
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr ""
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr ""
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr ""
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "fant ikke offentlig n�kkel %s: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr ""
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr ""
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr ""
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr ""
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7099,11 -5742,9 +7256,11 @@@ msgstr "PIN for CHV%d er for kort; minu
msgid "verify CHV%d failed: %s\n"
msgstr "bekreftelse av CHV%d mislyktes: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "feil ved henting av CHV-status fra kort\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "kort er permanent l�st!\n"
@@@ -7239,12 -5852,10 +7396,12 @@@ msgstr "kortet st�tter ikke digestalgor
msgid "signatures created so far: %lu\n"
msgstr "signaturer opprettet s� langt: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@@ -7266,7 -5874,6 +7423,7 @@@ msgstr "|N|Ny PIN
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7323,12 -5918,10 +7480,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7759,7 -6260,6 +7916,7 @@@ msgstr "feil ved opprettelse av n�kkelk
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "N�kkelgenerering mislyktes: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8357,7 -6737,6 +8514,7 @@@ msgstr "ugyldig sertifikat
msgid " runtime cached certificates: %u\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "preferansen %s er duplisert\n"
@@@ -8367,8 -6745,6 +8524,8 @@@
msgid "certificate cached\n"
msgstr "preferansen %s er duplisert\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
@@@ -8431,7 -6796,6 +8588,7 @@@ msgstr "lesing av offentlig n�kkel misl
msgid "not removing file '%s'\n"
msgstr "enarmoring failed: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "feil med �%s�: %s\n"
@@@ -8657,221 -6977,178 +8814,221 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "feil ved henting av ny PIN: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "ugyldig hashalgoritme �%s�\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr ""
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "keyserver send failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "sending til n�kkelserver mislyktes: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "feil ved henting av ny PIN: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting CRL item: %s\n"
msgstr "feil ved henting av ny PIN: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "generere et opphevingssertifikat"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "Key generation failed: %s\n"
msgid "CRL signature verification failed: %s\n"
msgstr "N�kkelgenerering mislyktes: %s\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "kan ikke opprette katalogen �%s�: %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "kan ikke opprette katalogen �%s�: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "oppdatering av hemmelig mislyktes: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr "ADVARSEL: ugyldig st�rrelse p� random_seed-fila - ikke brukt\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
#| msgid "error reading keyblock: %s\n"
msgid "problem reading cache key: %s\n"
msgstr "feil ved lesing av n�kkelblokk: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
@@@ -8917,73 -7184,57 +9074,73 @@@ msgstr "feil ved lesing av �%s�: %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "feil ved lesing av �%s�: %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "preferansen %s er duplisert\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "ugyldig sertifikat"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "ugyldig sertifikat"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "ugyldig sertifikat"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "ugyldig sertifikat"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
msgstr ""
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -8991,227 -7242,156 +9148,200 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "kan ikke �pne n�kkelknippet"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "loading CRL '%s' failed: %s\n"
msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "preferansen %s er duplisert\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "Denne n�kkelen er utg�tt!"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "kan ikke stat() �%s�: %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "klarte ikke � lagre n�kkelen: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "kan ikke �pne n�kkelknippet"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"St�ttede algoritmer:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "leser valg fra �%s�\n"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Avslutte uten � lagre? (j/N) "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "leser valg fra �%s�\n"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "kunne ikke parse n�kkelserverens URL\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9224,95 -7404,76 +9354,95 @@@ msgstr "
"@\n"
"(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "bruksm�te: gpg [valg] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, fuzzy
#| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
msgstr "%s er ikke tillatt sammen med %s!\n"
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "for lang linje"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "ugyldig fingeravtrykk"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "lesefeil ved �%s�: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "ikke tvunget"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9568,12 -7678,10 +9698,12 @@@ msgstr "
msgid "malloc failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9607,11 -7709,10 +9737,12 @@@ msgstr "feil ved lesing av �%s�: %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9760,73 -7831,62 +9891,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "klarte ikke � lagre n�kkelen: %s\n"
+
++#: dirmngr/server.c:2430
#, fuzzy, c-format
#| msgid "failed to initialize the TrustDB: %s\n"
msgid "failed to initialize the server: %s\n"
msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
#, fuzzy, c-format
#| msgid "failed to store the creation date: %s\n"
msgid "failed to the register commands with Assuan: %s\n"
msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10079,11 -8079,9 +10215,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/pl.gmo
index 672b561,0000000..27746c8
mode 100644,000000..100644
Binary files differ
diff --cc po/pl.po
index 711f1b0,5fd2922..e06d1df
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\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"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "Wprowad� nowe has�o
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Jako��:"
@@@ -88,72 -76,56 +88,72 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Jako�� wpisanego wy�ej tekstu.\n"
"Kryteria jako�ci mo�na uzyska� od administratora."
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr "Prosz� wprowadzi� sw�j PIN, �eby odblokowa� klucz tajny dla tej sesji"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
"Prosz� wprowadzi� swoje has�o, �eby odblokowa� klucz tajny dla tej sesji"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Has�o:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "nie pasuj� - prosz� spr�bowa� jeszcze raz"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (pr�ba %d z %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "PIN zbyt d�ugi"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Has�o zbyt d�ugie"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "Niew�a�ciwy znak w PIN-ie"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "PIN zbyt kr�tki"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "Niepoprawny PIN"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Niepoprawne has�o"
@@@ -162,25 -133,11 +162,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -256,11 -200,9 +256,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "nie uda�o si� utworzy� strumienia z gniazda: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "Prosz� w�o�y� kart� z numerem seryjnym"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "Prosz� wyj�� obecn� kart� i w�o�y� kart� z numerem seryjnym"
@@@ -420,41 -336,27 +420,41 @@@ msgstr "
"@Opcje:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "uruchomienie w trybie demona (w tle)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "z dodatkowymi informacjami"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "mniej komunikat�w"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "wyj�cie polece� w stylu sh"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "wyj�cie polece� w stylu csh"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "nie odczepianie od konsoli"
@@@ -535,11 -420,6 +535,11 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -561,151 -439,113 +561,150 @@@ msgstr "
"Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarz�dzanie kluczem tajnym dla GnuPG\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, 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:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "nie mo�na utworzy� gniazda: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, 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:1750
++#: agent/gpg-agent.c:1735
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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "b��d podczas pobierania nonce z gniazda\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, 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:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() nie powiod�o si�: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, 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:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 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:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "b��d odczytu nonce z fd %d: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "obs�uga 0x%lx dla fd %d uruchomiona\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "obs�uga 0x%lx dla fd %d zako�czona\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, 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:2288
++#: agent/gpg-agent.c:2273
#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, 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:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s zatrzymany\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
@@@ -722,8 -560,6 +721,8 @@@ msgstr "
"Sk�adnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
"Utrzymuwanie pami�ci hase�\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -731,9 -567,6 +730,9 @@@ msgstr "
"@Polecenia:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -787,7 -612,6 +786,7 @@@ msgstr "anulowano\n
msgid "error while asking for the passphrase: %s\n"
msgstr "b��d podczas pytania o has�o: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -984,8 -774,6 +983,8 @@@ msgstr "b��d tworzenia potoku: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "b��d tworzenia potoku: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "b��d podczas tworzenia procesu: %s\n"
@@@ -1140,7 -896,6 +1139,7 @@@ msgstr "gpg-agent nie dzia�a - uruchami
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "oczekiwanie (%d s) na uruchomienie agenta\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1162,7 -914,6 +1161,7 @@@ msgstr "dirmngr nie dzia�a - uruchamian
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "oczekiwanie (%d s) na uruchomienie agenta\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1426,7 -1117,6 +1425,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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "brak pami�ci\n"
@@@ -1612,19 -1264,14 +1611,19 @@@ msgstr "nie uda�o si� przekaza� zapytan
msgid "Enter passphrase: "
msgstr "Has�o\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Karta OpenPGP niedost�pna: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Wykryto kart� OpenPGP nr %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "nie dzia�a w trybie wsadowym\n"
@@@ -1636,155 -1281,116 +1635,155 @@@ msgstr "To polecenie jest dost�pne tylk
msgid "Reset Code not or not anymore available\n"
msgstr "Kod resetuj�cy nie jest (ju� lub w og�le) dost�pny\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Tw�j wyb�r? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[nie ustawiono]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "m�czyzna"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "kobieta"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "nie podano"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "nie wymuszono"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "wymuszono"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "B��d: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "B��d: znak ,,<'' nie mo�e by� u�yty.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "B��d: podw�jne spacje nie s� dopuszczalne.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Nazwisko posiadacza karty: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Imi� posiadacza karty: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "B��d: pe�ne personalia zbyt d�ugie (limit to %d znak�w).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "URL do odczytania klucza publicznego: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "B��d: URL zbyt d�ugi (limit to %d znak�w).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "b��d przydzielania wystarczaj�cej ilo�ci pami�ci: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "b��d odczytu ,,%s'': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "b��d zapisu ,,%s'': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Dane logowania (nazwa konta): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "B��d: dane logowania zbyt d�ugie (limit to %d znak�w).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Prywatne dane DO: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "B��d: prywatne DO zbyt d�ugie (limit to %d znak�w).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Preferowane j�zyki: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "B��d: niew�a�ciwa d�ugo�� tekstu preferencji.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "B��d: niew�a�ciwe znaki w tek�cie preferencji.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "P�e� (M - m�czyzna, F - kobieta lub spacja): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "B��d: niew�a�ciwa odpowied�.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "Odcisk CA:"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "B��d: niew�a�ciwie sformatowany odcisk.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "operacja na kluczu niewykonalna: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "to nie jest karta OpenPGP"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "b��d podczas odczytu aktualnych informacji o kluczu: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Zast�pi� istniej�cy klucz? (t/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1799,57 -1405,45 +1798,57 @@@ msgstr "
" Je�li tworzenie klucza nie powiedzie si�, prosz� sprawdzi�\n"
" dokumentacj� karty, aby pozna� dozwolone rozmiary.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Jakiej d�ugo�ci klucz do podpisywania wygenerowa�? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Jakiej d�ugo�ci klucz do szyfrowania wygenerowa�? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Jakiej d�ugo�ci klucz do uwierzytelniania wygenerowa�? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokr�glono do %u bit�w\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "Rozmiary kluczy %s musz� by� z przedzia�u %u-%u\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Karta zostanie przekonfigurowana do tworzenia klucza %u-bitowego\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "b��d podczas zmiany rozmiaru klucza %d na %u bit�w: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Stworzy� poza kart� kopi� zapasow� klucza szyfruj�cego? (T/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "UWAGA: klucze s� ju� zapisane na karcie!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Zast�pi� istniej�ce klucze? (t/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1864,145 -1458,110 +1863,145 @@@ msgstr "
" PIN = ,,%s'' PIN administracyjny = ,,%s''\n"
"Nale�y je zmieni� przy u�yciu polecenia --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Prosz� wybra� rodzaj klucza do wygenerowania:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Klucz do podpis�w\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Klucz do szyfrowania\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Klucz do uwierzytelniania\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Niew�a�ciwy wyb�r.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Prosz� wybra� gdzie zapisa� klucz:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "odczyt nie powi�d� si�: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "UWAGA: klucze s� ju� zapisane na karcie!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Podpisa� go? (t/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "wyj�cie z tego menu"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "pokazanie polece� administratora"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "ten tekst pomocy"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "wypisanie wszystkich dost�pnych danych"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "zmiana nazwy posiadacza karty"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "zmiana URL-a do odczytu klucza"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "pobranie klucza okre�lonego w URL-u karty"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "zmiana nazwy logowania"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "zmiana preferowanych j�zyk�w"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "zmiana p�ci posiadacza karty"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "zmiana odcisku CA"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "wygenerowanie nowych kluczy"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "menu do zmiany lub odblokowania PIN-u"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "odblokowanie PIN-u przy u�yciu kodu resetuj�cego"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/karta> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "Polecenie tylko dla administratora\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Polecenia dla administratora s� dozwolone\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Polecenia dla administratora nie s� dozwolone\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawne polecenie (spr�buj ,,help'')\n"
@@@ -2010,76 -1568,63 +2009,83 @@@
msgid "--output doesn't work for this command\n"
msgstr "opcja --output nie dzia�a z tym poleceniem\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, 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:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "b��d odczytu bloku kluczy: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(chyba, �e klucz zostaje wybrany przez podanie odcisku)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "bez opcji ,,--yes'' nie dzia�a w trybie wsadowym\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Usun�� ten klucz ze zbioru? (t/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "To jest klucz tajny! - czy na pewno go usun��? (t/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "deleting secret %s failed: %s\n"
msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr ""
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Asymetryczne: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "informacja o zaufaniu dla w�a�ciciela klucza zosta�a wymazana\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "b��d podczas tworzenia has�a: %s\n"
@@@ -2134,7 -1671,6 +2140,7 @@@ msgstr "
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:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%s nie jest dost�pne w trybie %s\n"
@@@ -2222,276 -1742,230 +2228,297 @@@ msgstr "OSTRZE�ENIE: nie mo�na skasowa
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "eksport podpis�w oznaczonych jako tylko lokalne"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "eksport atrybut�w ID u�ytkownika (og�lnie ID zdj��)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "eksport kluczy uniewa�niaj�cych oznaczonych jako ,,poufne''"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "usuni�cie bezu�ytecznych cz�ci z klucza przy eksporcie"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "usuni�cie jak najwi�kszej cz�ci klucza przy eksporcie"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "eksport kluczy tajnych nie jest dozwolony\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "klucz %s: klucz PGP 2.x - pomini�ty\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "klucz %s: zawarto�� klucza na karcie - pomini�to\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: pomini�ty: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[brak identyfikatora u�ytkownika]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "automatycznie pobrano `%s' poprzez %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "b��d odtwarzania ,,%s'' poprzez %s: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "Brak odcisku"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "brak argumentu dla opcji ,,%.50s''\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %s.\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "u�ywany jest podklucz %s zamiast klucza g��wnego %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "z�o�enie podpisu"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "z�o�enie podpisu pod dokumentem"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "z�o�enie podpisu oddzielonego od dokumentu"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "szyfrowanie danych"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lne)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "lista kluczy"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "lista kluczy i podpis�w"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "wypisanie i sprawdzenie podpis�w kluczy"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu uniewa�nienia klucza"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "z�o�enie podpisu na kluczu"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "z�o�enie prywatnego podpisu na kluczu"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "z�o�enie podpisu na kluczu"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "z�o�enie prywatnego podpisu na kluczu"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "zmiana has�a"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "eksport kluczy do pliku"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "eksport kluczy do serwera kluczy"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "import kluczy z serwera kluczy"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "szukanie kluczy na serwerze"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "od�wie�enie wszystkich kluczy z serwera"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "import/do��czenie kluczy"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "wy�wietlenie stanu karty"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "zmiana danych na karcie"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "zmiana PIN-u karty"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "wypisanie skr�t�w wiadomo�ci"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "uruchomienie w trybie serwera"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|U�YTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
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:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|PLIK|zapis wyj�cia do PLIKU"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "pytanie przed nadpisaniem plik�w"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "�cis�e zachowanie OpenPGP"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2499,7 -1973,6 +2526,7 @@@ msgstr "
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2521,13 -1994,11 +2548,13 @@@ msgstr "
" --list-keys [nazwy] pokazanie klucze\n"
" --fingerprint [nazwy] pokazanie odcisk�w kluczy\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2542,7 -2013,6 +2569,7 @@@ msgstr "
"Podpisywanie, sprawdzanie podpis�w, szyfrowanie, rozszyfrowywanie\n"
"Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2550,78 -2020,64 +2577,78 @@@ msgstr "
"\n"
"Obs�ugiwane algorytmy:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Asymetryczne: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Symetryczne: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Skr�t�w: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Kompresji: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "wywo�anie: gpgsm [opcje]"
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2629,7 -2085,6 +2656,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2639,7 -2094,6 +2666,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2647,7 -2101,6 +2674,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2655,7 -2108,6 +2682,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2666,7 -2118,6 +2693,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2674,492 -2125,444 +2701,564 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, 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:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
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:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "Dost�pne klucze:\n"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option `%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "nieznana opcja ,,%s''\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command `%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "nieznane polecenie ,,%s''\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "opcja ,,%.50s'' jest niejednoznaczna\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+
++#: g10/gpg.c:2423
#, 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:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, 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:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "niezrozumia�y URL serwera kluczy\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
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:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "sprawdzanie podpis�w z danymi PKA"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, 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:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "Niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno u�ywa� %s z %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w po��czeniu z %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nie zadzia�a z niebezpieczn� pami�ci� z powodu %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm kompresji jest niepoprawny\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
"niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "niew�a�ciwe domy�lne ustawienia\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "niew�a�ciwe ustawienia szyfr�w\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "niew�a�ciwe ustawienia skr�t�w\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie dzia�a z %s!\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, 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/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [plik]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, 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:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [plik]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
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:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [plik]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [plik]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
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:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [plik]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key nazwa u�ytkownika"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa u�ytkownika"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd <id-u�ytkownika>"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, 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:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[nazwa pliku]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|PLIK|pobieranie kluczy ze zbioru PLIK"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "nie traktowa� konfliktu datownik�w jako b��du"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|pisanie opisu stanu do deskryptora FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3336,7 -2705,6 +3435,7 @@@ msgid "you can update your preferences
msgstr ""
"mo�na uaktualni� swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "klucz %s: brak identyfikatora u�ytkownika\n"
@@@ -3347,7 -2714,6 +3446,7 @@@
msgid "key %s: %s\n"
msgstr "pomini�ty ,,%s'': %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3370,7 -2732,6 +3469,7 @@@ msgstr "klucz %s: brak poprawnych ident
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klucz %s: brak klucza publicznego: %s\n"
@@@ -3380,265 -2740,228 +3479,280 @@@
msgid "key %s: new key - skipped\n"
msgstr "klucz %s: nowy klucz - pomini�ty\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "zapis do ,,%s''\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klucz %s: nie zgadza si� z lokaln� kopi�\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
- #: g10/import.c:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "klucz %s: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klucz %s: ,,%s'' %d nowych podpis�w\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpis�w wyczyszczonych\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "klucz %s: ,,%s'' %d identyfikator u�ytkownika wyczyszczony\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klucz %s: ,,%s'' bez zmian\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, 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:1663
++#: g10/import.c:1680
#, 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:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "klucz %s: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klucz %s: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klucz %s: brak identyfikatora u�ytkownika do podpisu\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klucz %s: nieobs�ugiwany algorytm asymetryczny\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "klucz %s: nieprawid�owy bezpo�redni podpis\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "klucz %s: brak podklucza do dowi�zania\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klucz %s: niepoprawne dowi�zanie podklucza\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "klucz %s: usuni�to wielokrotne dowi�zanie podklucza\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klucz %s: niepoprawne uniewa�nienie podklucza\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "klucz %s: usuni�to wielokrotne uniewa�nienie podklucza\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klucz %s: pomini�to identyfikator u�ytkownika ,,%s''\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klucz %s: podklucz pomini�ty\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klucz %s: ,,%s'' dodany certyfikat uniewa�nienia\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "klucz %s: dodano bezpo�redni podpis\n"
@@@ -3667,63 -2986,55 +3781,69 @@@ msgstr "keybox ,,%s'' utworzony\n
msgid "keyring '%s' created\n"
msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "zas�b bloku klucza `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening `%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "b��d podczas otwierania ,,%s'': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[uniewa�nienie]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[podpis klucza nim samym]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 niepoprawny podpis\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d niepoprawnych podpis�w\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr ""
"wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3734,17 -3045,14 +3854,17 @@@ msgstr "
"to�samo�ci innych u�ytkownik�w (czy sprawdzi on odciski kluczy pobrane\n"
"z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = mam ograniczone zaufanie\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = mam pe�ne zaufanie\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3754,45 -3062,38 +3874,50 @@@ msgstr "
"Poziom wy�szy ni� 1 umo�liwia u�ywanie podpisywanego w�a�nie klucza\n"
"do wykonywania zaufanych podpis�w w twoim imieniu.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Prosz� wpisa� domen� ograniczaj�c� ten podpis lub Enter dla �adnej.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Czy na pewno chcesz podpisa�? (t/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Nie da si� z�o�y� podpisu.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Identyfikator u�ytkownika ,,%s'' jest podpisywalny. "
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Podpisa� go? (t/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3801,11 -3102,9 +3926,11 @@@ msgstr "
"Podpis klucza nim samym na ,,%s''\n"
"jest podpisem z�o�onym przez PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3814,11 -3113,9 +3939,11 @@@ msgstr "
"Tw�j podpis na ,,%s''\n"
"przekroczy� dat� wa�no�ci.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3827,45 -3124,36 +3952,45 @@@ msgstr "
"Tw�j podpis na ,,%s''\n"
"jest podpisem prywatnym (lokalnym).\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr ",,%s'' jest ju� lokalnie podpisany kluczem %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr ",,%s'' jest ju� podpisany kluczem %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Czy na pewno chcesz to podpisa� jeszcze raz? (t/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nie ma nic do podpisania kluczem %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Data wa�no�ci tego klucza up�yn�a!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Wa�no�� tego klucza wygasa %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3874,33 -3162,27 +3999,33 @@@ msgstr "
"Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
"Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nie odpowiem na to pytanie. %s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) W og�le nie.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Pobie�nie.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Bardzo dok�adnie.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3909,242 -3191,187 +4034,242 @@@ msgstr "
"Czy jeste� naprawd� pewien, �e chcesz podpisa� ten klucz\n"
"swoim kluczem ,,%s'' (%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "To b�dzie podpis klucza nim samym.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"OSTRZE�ENIE: podpis nie zostanie oznaczony jako prywatny "
"(nieeksportowalny).\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"OSTRZE�ENIE: podpis nie zostanie oznaczony jako nie podlegaj�cy "
"uniewa�nieniu.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Czy na pewno podpisa�? (t/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Klucz ma tylko za�lepk� albo elementy na karcie - nie ma has�a do zmiany.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "b��d podczas tworzenia has�a: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "zapis zmian i wyj�cie"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "okazanie odcisku klucza"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Uchwyt klucza: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "lista kluczy i identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "wyb�r identyfikatora u�ytkownika N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "wyb�r podklucza N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "sprawdzenie podpis�w"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"z�o�enie podpisu na wybranych identyfikatorach u�ytkownika [* poni�ej "
"powi�zane polecenia]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr ""
"z�o�enie prywatnego (lokalnego) podpisu na wybranych identyfikatorach "
"u�ytkownika"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "podpisanie wybranych identyfikator�w u�ytkownika sygnatur� zaufania"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
"podpisanie wybranych identyfikator�w u�ytkownika sygnatur� nie podlegaj�c� "
"uniewa�nieniu"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "dodanie zdj�cia u�ytkownika do klucza"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "usuni�cie wybranych identyfikator�w u�ytkownika z klucza"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "dodanie podklucza"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "dodanie klucza do karty procesorowej"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "przeniesienie klucza na kart� procesorow�"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "przeniesienie klucza zapasowego na kart� procesorow�"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "usuni�cie wybranych podkluczy"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "dodanie klucza uniewa�niaj�cego"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "usuni�cie podpis�w z wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "zmiana daty wyga�ni�cia dla klucza lub wybranych podkluczy"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "oznaczenie wybranego identyfikatora u�ytkownika jako g��wnego"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "ustawienia (zaawansowane)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "rozbudowana lista ustawie�"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "ustawienie listy preferencji dla wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"ustawienie URL-a preferowanego serwera kluczy dla wybranych identyfikator�w "
"u�ytkownika"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "ustawienie adnotacji dla wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "zmiana has�a klucza"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "zmiana zaufania w�a�ciciela"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "uniewa�nienie podpis�w na wybranych identyfikatorach u�ytkownika"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "uniewa�nienie wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "uniewa�nienie klucza lub wybranych podkluczy"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "w��czenie klucza do u�ycia"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "wy��czenie klucza z u�ycia"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "okazanie wybranych identyfikator�w - zdj��"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"zag�szczanie bezu�ytecznych ID u�ytkownik�w i usuwanie bezu�ytecznych "
"podpis�w z kluczy"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"zag�szczanie bezu�ytecznych ID u�ytkownik�w i usuwanie wszystkich podpis�w z "
"kluczy"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Dost�pny jest klucz tajny.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4164,259 -3391,203 +4289,260 @@@ msgstr "
"(ltsign,\n"
" tnrsign itd.).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Klucz uniewa�niony."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Czy na pewno podpisa� wszystkie identyfikatory u�ytkownika? (t/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Czy na pewno podpisa� wszystkie identyfikatory u�ytkownika? (t/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Nieznany rodzaj podpisu ,,%s''\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr ""
"Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? (t/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? (t/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Czy na pewno przenie�� g��wny klucz (t/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Musisz wybra� dok�adnie jeden klucz.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "Polecenie oczekuje argumentu b�d�cego nazw� pliku\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "Nie mo�na otworzy� ,,%s'': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "B��d podczas odczytu klucza zapasowego z `%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Musisz wybra� co najmniej jeden klucz.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Czy na pewno chcesz usun�� ten klucz? (t/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr ""
"Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? (t/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? (t/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Czy na pewno chcesz uniewa�ni� ca�y klucz? (t/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Czy na pewno chcesz uniewa�ni� wybrane podklucze? (t/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Czy na pewno chcesz uniewa�ni� ten podklucz? (t/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Zaufanie u�ytkownika nie mo�e by� ustawione podczas u�ywania bazy zaufania\n"
"dostarczonej przez u�ytkownika\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Ustawienie listy ustawie� na:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Czy na pewno uaktualni� ustawienia dla wybranych identyfikator�w? (t/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Czy na pewno uaktualni� ustawienia? (t/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Zapisa� zmiany? (t/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Wyj�� bez zapisania zmian? (t/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "zapis zmian nie powi�d� si�: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "niew�a�ciwy odcisk"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "nie uda�o si� pobra� odcisku\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Brak takiego identyfikatora u�ytkownika.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Nie ma nic do podpisania kluczem %s\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Skr�t: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Ustawienia: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "no-modify dla serwera kluczy"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Preferowany serwer kluczy: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Adnotacje: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Ten klucz zosta� uniewa�niony %s przez klucz u�ytkownika %s %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s u�ytkownika %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(poufne)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "utworzono: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "uniewa�niono: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "wygas�: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "wygasa: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "u�ycie: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "nr-karty: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "zaufanie: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "poprawno��: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Ten klucz zosta� wy��czony z u�ytku"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4424,17 -3595,12 +4550,17 @@@ msgstr "
"Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
"dop�ki program nie zostanie uruchomiony ponownie.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "uniewa�niony"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "wygas�"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4443,17 -3609,14 +4569,17 @@@ msgstr "
" jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
" wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4462,78 -3625,61 +4588,78 @@@ msgstr "
"OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
" niekt�re wersje przestan� go rozumie�.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Czy dalej chcesz je doda�? (t/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "Taki identyfikator u�ytkownika ju� istnieje na tym kluczu!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Usun�� ten poprawny podpis? (t/N/w) "
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Usun�� ten nieznany podpis? (t/N/w) "
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d podpis usuni�ty.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d podpis�w usuni�tych.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Nic nie zosta�o usuni�te.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "niepoprawny"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Identyfikator u�ytkownika ,,%s'' upakowany: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis�w wyczyszczonych\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Identyfikator u�ytkownika ,,%s'': ju� zmniejszony.\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Identyfikator u�ytkownika ,,%s'': ju� czysty.\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4543,187 -3689,156 +4669,198 @@@ msgstr "
" uniewa�niaj�cego spowoduje, �e niekt�re wersje PGP przestan�\n"
" go rozumie�.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "nie mo�na wyznaczy� klucza do uniewa�niania jego samego\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "ten klucz zosta� ju� uznany kluczem uniewa�niaj�cym\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Zmiana daty wa�no�ci podklucza.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "podklucz podpisuj�cy %s jest ju� skro�nie podpisany\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"podklucz %s nie jest podpisuj�cy, wi�c nie musi by� skro�nie podpisany\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Podaj preferowany URL serwera kluczy: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Czy na pewno chcesz go zast�pi�? (t/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Czy na pewno chcesz go usun��? (t/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Adnotacje: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "Kontynuowa�? (t/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Brak identyfikatora u�ytkownika o skr�cie %s\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Brak podklucza o numerze %d.\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "Brak podklucza o numerze %d.\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "identyfikator u�ytkownika: ,,%s''\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "podpisany twoim kluczem %s w %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (podpis nieeksportowalny) "
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Wa�no�� tego klucza wygas�a %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "Nie podpisane przez ciebie.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Te identyfikatory na kluczu %s s� podpisane przez Ciebie:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (podpis nieuniewa�nialny) "
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "uniewa�niony przez tw�j klucz %s w %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "brak klucza tajnego\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
"przysz�o�ci)\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Klucz %s jest ju� uniewa�niony.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Podklucz %s jest ju� uniewa�niony.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4766,14 -3873,10 +4903,14 @@@ msgstr "zapis podpisu klucza nim samym\
msgid "writing key binding signature\n"
msgstr "zapis podpisu wi���cego klucz\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rozmiar klucza zaokr�glony w g�r� do %u bit�w\n"
@@@ -5071,41 -4125,36 +5208,46 @@@ msgstr "
msgid "Real name: "
msgstr "Imi� i nazwisko: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Imi� i nazwisko musz� mie� co najmniej 5 znak�w d�ugo�ci.\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "To nie jest poprawny adres poczty elektronicznej\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Komentarz: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Niew�a�ciwy znak w komentarzu\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "U�ywasz zestawu znak�w %s.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5116,7 -4165,6 +5258,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Nie nale�y umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
@@@ -5133,27 -4181,22 +5275,27 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
"czy (W)yj�� z programu? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
@@@ -5161,11 -4204,9 +5303,11 @@@ msgstr "
"Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
"czy (W)yj�� z programu? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Najpierw trzeba poprawi� ten b��d\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5173,7 -4214,6 +5315,7 @@@ msgstr "
"Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@@ -5181,16 -4221,13 +5323,16 @@@ msgstr "
"Prosz� wprowadzi� has�o do zabezpieczenia kopii zapasowej poza kart� nowego "
"klucza szyfruj�cego."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5202,7 -4239,6 +5344,7 @@@ msgstr "
"\"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5218,12 -4254,10 +5360,12 @@@ msgstr "
"ilo�ci\n"
"entropii.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powiod�a si�: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5231,59 -4265,48 +5373,59 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "klucz ju� istnieje\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "U�y� tego klucza pomimo to? (t/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "generowanie nowego klucza\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zosta�a anulowana.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "zapisuj� klucz publiczny w ,,%s''\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5291,7 -4314,6 +5433,7 @@@ msgstr "
"Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
"mo�na doda� do niego podklucz szyfruj�cy.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5299,7 -4321,6 +5441,7 @@@ msgstr "
"klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5307,246 -4328,194 +5449,246 @@@ msgstr "
"klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Cz�� tajna g��wnego klucza jest zapisana na karcie.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Czy na pewno utworzy�? (t/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "zapis klucza na karcie nie powi�d� si�: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "nie mo�na utworzy� pliku kopii zapasowej ,,%s'': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "nigdy "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Krytyczny regulamin podpisu: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Regulamin podpisu: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Krytyczny preferowany serwer kluczy: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Krytyczne adnotacje podpisu: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Adnotacje podpisu: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 niepoprawny podpis\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d niepoprawnych podpis�w\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Zbi�r kluczy"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "pomini�ty ,,%s'': %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Odcisk klucza g��wnego:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Odcisk klucza g��wnego:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Odcisk klucza ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " Nr seryjny karty ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "buforowanie zbioru kluczy ,,%s''\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu kluczy zbuforowano do tej pory (%lu podpis�w)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu kluczy zbuforowano (%lu podpis�w)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: zbi�r kluczy utworzony\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "w��czenie uniewa�nionych kluczy do wynik�w wyszukiwania"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "w��czenie podkluczy przy poszukiwaniu po ID klucza"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "automatyczne pobieranie kluczy przy sprawdzaniu podpis�w"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "honorowanie URL-a preferowanego serwera kluczy ustawionego w kluczu"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "honorowanie rekordu PKA ustawionego w kluczu przy pobieraniu kluczy"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "wy��czony"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Wprowad� numer(y), N)ast�pny lub Q)uit > "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "niepoprawny protok� serwera kluczy (nasz %d != modu� obs�ugi %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ",,%s'' nie jest identyfikatorem klucza - pomini�to\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "od�wie�anie 1 klucza z %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "OSTRZE�ENIE: nie mo�na od�wie�y� klucza %s przez %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "od�wie�anie %d kluczy z %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "klucz ,,%s'' nie zosta� odnaleziony na serwerze kluczy\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "klucz nie zosta� odnaleziony na serwerze kluczy\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "zapytanie o klucz %s z serwera %s %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "zapytanie o klucz %s z %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "wysy�anie klucza %s na serwer %s %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "wysy�anie klucza %s na %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "zapytanie o klucz %s z %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "OSTRZE�ENIE: nie mo�na pobra� URI %s: %s\n"
@@@ -5581,7 -4544,6 +5723,7 @@@ msgid "encrypted with %u-bit %s key, I
msgstr ""
"zaszyfrowano %u-bitowym kluczem %s o identyfikatorze %s, stworzonym %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " ,,%s''\n"
@@@ -5627,264 -4580,213 +5769,265 @@@ msgstr "odszyfrowanie poprawne\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "wyczyszczono has�o zapami�tane z ID: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "b��d odszyfrowywania: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "pierwotna nazwa pliku='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "OSTRZE�ENIE: widziano wiele czystych tekst�w\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "nie znaleziono podpisu\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "NIEPOPRAWNY podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Przeterminowany podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "Poprawny podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "nie mo�na obs�u�y� tych wieloznacznych danych podpisu\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Podpisano w %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " przy u�yciu klucza %s %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Klucz dost�pny w: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[niepewne]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " alias ,,%s''"
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Wa�no�� podpisu wygas�a %s.\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Wa�no�� podpisu wygasa %s.\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binarny"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "tekstowy"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "nieznany"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algorytm: %s"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "nie jest oddzielonym podpisem.\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "oddzielony podpis klasy 0x%02x.\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starego typu (PGP 2.x).\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
#| msgid "fstat of `%s' failed in %s: %s\n"
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "fstat na ,,%s'' nie powiod�o si� w %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) nie powiod�o si� w %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr ""
"OSTRZE�ENIE: u�ycie eksperymentalnego algorytmu klucza publicznego %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"OSTRZE�ENIE: klucze do podpisywania i szyfrowania Elgamala s� odradzane\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "OSTRZE�ENIE: u�ycie eksperymentalnego szyfru %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "OSTRZE�ENIE: u�ycie eksperymentalnego algorytmu skr�tu %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "OSTRZE�ENIE: algorytm skr�tu %s jest odradzany\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "podpis %s, skr�t %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "w jej miejsce nale�y u�y� ,,%s%s''\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
"OSTRZE�ENIE: ,,%s'' jest przestarza�ym poleceniem - nie nale�y go u�ywa�\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: przestarza�a opcja ,,%s'' - nie ma efektu\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Nieskompresowany"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "nieskompresowany|brak"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "niejednoznaczna opcja ,,%s''\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "nieznana opcja ,,%s''\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA wymaga d�ugo�ci skr�tu b�d�cego wielokrotno�ci� 8 bit�w\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type `%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Nieznany rodzaj podpisu ,,%s''\n"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6086,31 -4955,24 +6229,31 @@@ msgstr "Czy zdj�cie jest w porz�dku? (t
msgid "unable to display photo ID!\n"
msgstr "nie mo�na wy�wietli� zdj�cia!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "nie podano przyczyny"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "klucz zosta� zast�piony"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "klucz zosta� skompromitowany"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "klucz nie jest ju� u�ywany"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "identyfikator u�ytkownika przesta� by� poprawny"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "pow�d uniewa�nienia: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "komentarz do uniewa�nienia: "
@@@ -6124,52 -4986,41 +6267,52 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMwWpP"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Brak warto�ci zaufania dla:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " alias ,,%s''\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "Jak bardzo ufasz, �e ten klucz naprawd� nale�y do tej osoby?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = nie wiem albo nie powiem\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NIE ufam\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = ufam absolutnie\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = powr�t do g��wnego menu\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " p = pomini�cie tego klucza\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " w = wyj�cie\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6178,37 -5029,29 +6321,37 @@@ msgstr "
"Minimalny poziom zaufania dla tego klucza to: %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Twoja decyzja? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Czy na pewno chcesz przypisa� absolutne zaufanie temu kluczowi? (t/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr "%s: Nie ma �adnej pewno�ci, czy ten klucz nale�y do tej osoby\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr "%s: Nie ma ca�kowitej pewno�ci, czy ten klucz nale�y do tej osoby\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Ten klucz prawdopodobnie nale�y do tej osoby\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Ten klucz nale�y do nas\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6218,120 -5061,95 +6361,120 @@@ msgstr "
"Je�li nie masz co do tego �adnych w�tpliwo�ci i *naprawd�* wiesz co robisz,\n"
"mo�esz odpowiedzie� ,,tak'' na nast�pne pytanie.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "U�y� tego klucza pomimo to? (t/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " To mo�e oznacza�, �e podpis jest fa�szerstwem.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, 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:588
++#: g10/pkclist.c:589
#, 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:600
++#: g10/pkclist.c:601
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:608
++#: g10/pkclist.c:609
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:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Ten podpis prawdopodobnie jest FA�SZYWY.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: pomini�ty: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, 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:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Aktualni odbiorcy:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6339,76 -5157,59 +6482,76 @@@ msgstr "
"\n"
"Identyfikator u�ytkownika (pusta linia oznacza koniec): "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Brak takiego identyfikatora u�ytkownika.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Klucz publiczny wy��czony z u�ycia.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nieznany domy�lny adresat ,,%s''\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "brak poprawnych adresat�w\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Uwaga: klucz %s nie ma cechy %s\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "b��d tworzenia ,,%s'': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Podpis oddzielony od danych.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Nazwa pliku danych: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "czytam strumie� standardowego wej�cia\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "brak podpisanych danych\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nie mo�na otworzy� podpisanych danych z fd=%d: %s\n"
@@@ -6448,8 -5242,6 +6591,8 @@@ msgstr "UWAGA: wa�no�� klucza tajnego %
msgid "Note: key has been revoked"
msgstr "UWAGA: klucz zosta� uniewa�niony"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
@@@ -6459,43 -5250,39 +6602,49 @@@
msgid "key %s has no user IDs\n"
msgstr "klucz %s nie ma identyfikator�w u�ytkownika\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Zostanie uniewa�niony przez:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(to jest czu�y klucz uniewa�niaj�cy)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Dost�pny jest klucz tajny.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "wymuszono opakowanie ASCII wyniku.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6503,18 -5290,27 +6652,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6538,33 -5334,26 +6701,33 @@@ msgstr "
"komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
"nieupowa�nionym.\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Anuluj"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Pow�d uniewa�nienia: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(nie podano)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Informacje poprawne? (t/N) "
@@@ -6591,37 -5376,30 +6754,37 @@@ msgstr "Klucz %s u�ywa niebezpiecznego
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "Klucz DSA %s wymaga %u-bitowego lub wi�kszego skr�tu\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "OSTRZE�ENIE: konflikt skr�t�w podpis�w w wiadomo�ci\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %s nie jest skro�nie podpisany\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "obja�nienie mo�na przeczyta� tutaj: %s\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"OSTRZE�ENIE: podklucz podpisuj�cy %s jest niepoprawnie skro�nie podpisany\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "klucz publiczny %s jest o %lu sekund(y) m�odszy od podpisu\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6629,7 -5407,6 +6792,7 @@@ msgstr "
"klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6637,31 -5414,26 +6800,31 @@@ msgstr "
"klucz %s zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "UWAGA: klucz podpisuj�cy %s przekroczy� dat� wa�no�ci %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "UWAGA: klucz podpisuj�cy %s zosta� uniewa�niony\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"uznano za z�y podpis utworzony kluczem %s z powodu nieznanego bitu "
"krytycznego\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "klucz %s: brak podklucza dla podpisu uniewa�nienia podklucza\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "klucz %s: brak podklucza dowi�zywanego podpisem\n"
@@@ -6707,33 -5473,27 +6870,33 @@@ msgstr "
msgid "signing:"
msgstr "podpis:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "zostanie u�yty szyfr %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap�\n"
"generatora liczb losowych!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "pomini�ty ,,%s'': duplikat\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniaj�cy "
"bezpiecznych podpis�w!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
@@@ -6781,7 -5533,6 +6944,7 @@@ msgstr "b��d podczas szukania zapisu wa
msgid "read error in '%s': %s\n"
msgstr "b��d odczytu w ,,%s'': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
@@@ -6812,7 -5558,6 +6975,7 @@@ msgstr "baza zaufania, wpis %lu: zapis
msgid "trustdb transaction too large\n"
msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -6929,115 -5651,92 +7092,115 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr ",,%s'' nie jest poprawnym d�ugim numerem klucza\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "klucz %s: zaakceptowany jako klucz zaufany\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "klucz %s jest wpisany wi�cej ni� raz w bazie zaufania\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "klucz %s: brak klucza publicznego dla zaufanego klucza - pomini�ty\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "klucz %s zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "Mo�na pr�bowa� odtworzy� baz� zaufania przy u�yciu polece�:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "Je�li to nie dzia�a, nale�y poradzi� si� instrukcji\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"nie mo�na u�y� nieznanego modelu zaufania (%d) - przyj�to model zaufania %s\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "u�ycie modelu zaufania %s\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "sprawdzanie bazy jest niepotrzebne\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
#| msgid "no need for a trustdb check with `%s' trust model\n"
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "sprawdzanie bazy jest niepotrzebne przy modelu zaufania ,,%s''\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
#| msgid "no need for a trustdb update with `%s' trust model\n"
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "aktualizacja bazy jest niepotrzebna przy modelu zaufania ,,%s''\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "klucz publiczny %s nie odnaleziony: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "sprawdzanie bazy zaufania\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "brak absolutnie zaufanych kluczy\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "potrzeba %d marginalnych, %d pe�nych, model zaufania %s\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7045,7 -5744,6 +7208,7 @@@ msgstr "
"poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
"%du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7289,11 -5938,9 +7452,11 @@@ msgstr "PIN dla CHV%d jest zbyt kr�tki
msgid "verify CHV%d failed: %s\n"
msgstr "weryfikacja CHV%d nie powiod�a si�: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "b��d podczas odczytu stanu CHV z karty\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "karta zosta�a trwale zablokowana!\n"
@@@ -7425,14 -6044,12 +7588,14 @@@ msgstr "karta nie obs�uguje algorytmu s
msgid "signatures created so far: %lu\n"
msgstr "dotychczas stworzono podpis�w: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"weryfikacja PIN-u administracyjnego tym poleceniem jest aktualnie "
"zabroniona\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
@@@ -7452,7 -6066,6 +7615,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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
@@@ -7517,12 -6118,10 +7680,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "prosz� u�y� opcji ,,--daemon'' do uruchomienia programu w tle\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "obs�uga fd %d uruchomiona\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obs�uga fd %d zako�czona\n"
@@@ -7953,7 -6460,6 +8116,7 @@@ msgstr "linia %d: b��d pobierania klucz
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "linia %d: generowanie klucza nie powiod�o si�: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8570,7 -6956,6 +8733,7 @@@ msgstr "Do��czone certyfikaty
msgid " runtime cached certificates: %u\n"
msgstr "liczba pasuj�cych certyfikat�w: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -8582,8 -6966,6 +8745,8 @@@ msgstr " (certyfikat utworzony
msgid "certificate cached\n"
msgstr "certyfikat jest dobry\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -8655,7 -7026,6 +8818,7 @@@ msgstr "odbieranie linii nie powiod�o s
msgid "not removing file '%s'\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing cache file: %s\n"
@@@ -8900,240 -7226,197 +9063,240 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "b��d pobierania zapisanych flag: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr ""
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
#| msgid "iconv_open failed: %s\n"
msgid "converting S-expression failed: %s\n"
msgstr "iconv_open nie powiod�o si�: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "creating S-expression failed: %s\n"
msgstr "odbieranie linii nie powiod�o si�: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
#| msgid "error getting serial number of card: %s\n"
msgid "error getting update times of CRL: %s\n"
msgstr "b��d pobierania numeru seryjnego karty: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting CRL item: %s\n"
msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error inserting item into temporary cache file: %s\n"
msgstr "b��d zapisu do pliku tymczasowego: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
#| msgid "no issuer found in certificate"
msgid "no CRL issuer found in CRL: %s\n"
msgstr "nie znaleziono wystawcy w certyfikacie"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
#| msgid "error reading list of trusted root certificates\n"
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "b��d odczytu listy zaufanych certyfikat�w g��wnych\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "ksba_crl_new failed: %s\n"
msgstr "select nie powiod�o si�: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "odczyt nie powi�d� si�: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "removed stale temporary cache file '%s'\n"
msgstr "nie uda�o si� utworzy� pliku tymczasowego ,,%s'': %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "nie uda�o si� utworzy� pliku tymczasowego ,,%s'': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating temporary cache file '%s': %s\n"
msgstr "b��d tworzenia pliku tymczasowego: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "b��d zapisu do pliku tymczasowego: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error closing temporary cache file '%s': %s\n"
msgstr "b��d tworzenia pliku tymczasowego: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
#| msgid "error reading input: %s\n"
msgid "error reading CRL extensions: %s\n"
msgstr "b��d odczytu wej�cia: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "creating cache file '%s'\n"
msgstr "b��d tworzenia potoku: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid notation data found\n"
msgid " WARNING: invalid cache record length\n"
msgstr "OSTRZE�ENIE: napotkano b��dne dane adnotacji\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
#| msgid "error reading the card: %s\n"
msgid "problem reading cache record: %s\n"
msgstr "b��d odczytu karty: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
#| msgid "problem re-searching certificate: %s\n"
msgid "problem reading cache key: %s\n"
msgstr "problem z ponownym odszukaniem certyfikatu: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
#| msgid "error reading nonce on fd %d: %s\n"
msgid "error reading cache entry from db: %s\n"
msgstr "b��d odczytu nonce z fd %d: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "crl_fetch via DP failed: %s\n"
msgstr "odczyt nie powi�d� si�: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "sprawdzenie listy zaufania nie powiod�o si�: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9183,84 -7456,68 +9346,84 @@@ msgstr "b��d odtwarzania ,,%s'' poprze
msgid "error retrieving '%s': http status %u\n"
msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
#| msgid "certificate `%s' not found: %s\n"
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
#| msgid "certificate `%s' not found: %s\n"
msgid "certificate search not possible due to disabled %s\n"
msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
#| msgid " (certificate created at "
msgid "add a certificate to the cache"
msgstr " (certyfikat utworzony "
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
#| msgid "Included certificates"
msgid "validate a certificate"
msgstr "Do��czone certyfikaty"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
#| msgid "Included certificates"
msgid "lookup a certificate"
msgstr "Do��czone certyfikaty"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
#| msgid "Included certificates"
msgid "lookup only locally stored certificates"
msgstr "Do��czone certyfikaty"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "load a CRL into the dirmngr"
msgstr "przekazanie polecenia do dirmngr"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
#| msgid "export certificates"
msgid "expect certificates in PEM format"
msgstr "eksport certyfikat�w"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9268,248 -7525,173 +9431,217 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error reading certificate from stdin: %s\n"
msgstr "b��d zapisywania certyfikatu: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
#| msgid "error reading from %s: %s\n"
msgid "error reading certificate from '%s': %s\n"
msgstr "b��d odczytu z %s: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "zapis zmian nie powi�d� si�: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "loading CRL '%s' failed: %s\n"
msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "validation of certificate failed: %s\n"
msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "certyfikat jest dobry\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
#| msgid "certificate has been revoked"
msgid "certificate has been revoked\n"
msgstr "certyfikat zosta� uniewa�niony"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "certificate check failed: %s\n"
msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, 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/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- #, fuzzy
- #| msgid "no running dirmngr - starting `%s'\n"
- msgid "no running dirmngr - starting one\n"
- msgstr "dirmngr nie dzia�a - uruchamianie ,,%s''\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- #| msgid "malformed DIRMNGR_INFO environment variable\n"
- msgid "malformed %s environment variable\n"
- msgstr "z�y format zmiennej �rodowiskowej DIRMNGR_INFO\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "wersja %d protoko�u dirmngr nie jest obs�ugiwana\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "nieobs�ugiwany algorytm: %s"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: 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:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, 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:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "przekazanie polecenia do dirmngr"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Wyj�� bez zapisania zmian? (t/N) "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "zezwolenie na wyszukiwania PKA (��dania DNS)"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 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:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|u�ywaj serwera kluczy URL"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9522,13 -7704,11 +9654,13 @@@ msgstr "
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, 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:352
++#: dirmngr/dirmngr.c:355
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -9540,88 -7720,71 +9672,88 @@@ msgstr "
"Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarz�dzanie kluczem tajnym dla GnuPG\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, 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:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "wywo�anie: gpgsm [opcje]"
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, 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:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, 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:1582
++#: dirmngr/dirmngr.c:1591
#, 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:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "niew�a�ciwy odcisk"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, 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:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "nie wymuszono"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9890,12 -8002,10 +10022,12 @@@ msgstr "wysy�anie klucza %s na serwer %
msgid "malloc failed: %s\n"
msgstr "select nie powiod�o si�: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9933,11 -8037,11 +10065,13 @@@ msgstr "b��d odczytu z %s: %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr "B��d: prywatne DO zbyt d�ugie (limit to %d znak�w).\n"
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ #| msgid "certificate `%s' not found: %s\n"
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -10104,80 -8178,70 +10238,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "wysy�anie linii nie powiod�o si�: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "wysy�anie linii nie powiod�o si�: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select nie powiod�o si�: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "b��d wysy�ania polecenia %s: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select nie powiod�o si�: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select nie powiod�o si�: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, 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:2304
++#: dirmngr/server.c:2409
+ #, 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:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10449,13 -8453,11 +10589,13 @@@ msgstr "Opcje steruj�ce formatem wyj�ci
msgid "Options controlling the interactivity and enforcement"
msgstr "Opcje steruj�ce interaktywno�ci� i wymuszaniem"
+#: tools/gpgconf-comp.c:911
#, fuzzy
#| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr "Opcje steruj�ce bezpiecze�stwem"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "Konfiguracja dla serwer�w HTTP"
diff --cc po/pt.gmo
index 5d84b12,0000000..0059a86
mode 100644,000000..100644
Binary files differ
diff --cc po/pt.po
index 70d8f66,ad96dc8..84e253b
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2015-02-11 19:17+0100\n"
"Last-Translator: Pedro Morais <morais at kde.org>\n"
"Language-Team: pt <morais at kde.org>\n"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "frase-secreta inv�lida
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -80,75 -68,59 +80,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Por favor digite a frase secreta \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "frase secreta incorrecta"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "frase secreta demasiado longa\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "frase secreta demasiado longa\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Caracter inv�lido no nome\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "MPI incorreto"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "frase secreta incorrecta"
@@@ -158,25 -129,11 +158,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -249,11 -193,9 +249,11 @@@ msgstr "Por favor digite a frase secret
msgid "failed to create stream from socket: %s\n"
msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -396,42 -312,28 +396,42 @@@ msgstr "
"Op��es:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detalhado"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -518,11 -403,6 +518,11 @@@ msgstr "n�o suportado
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -538,144 -416,106 +538,143 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "imposs�vel criar %s: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "a escrever chave privada para `%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directoria criada\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: imposs�vel criar directoria: %s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
@@@ -691,8 -529,6 +690,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -700,9 -536,6 +699,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -756,7 -581,6 +755,7 @@@ msgstr "cancelado pelo utilizador\n
msgid "error while asking for the passphrase: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -939,8 -729,6 +938,8 @@@ msgstr "erro na cria��o da frase secret
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -1094,7 -850,6 +1093,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1113,7 -865,6 +1112,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1407,7 -1098,6 +1406,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "n�o processado"
@@@ -1591,19 -1243,14 +1590,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "chave secreta n�o dispon�vel"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
@@@ -1618,222 -1263,171 +1617,222 @@@ msgstr "Este comando n�o � permitido n
msgid "Reset Code not or not anymore available\n"
msgstr "partes da chave secreta n�o dispon�veis\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Op��o? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "Nenhum motivo especificado"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "n�o processado"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "a escrever chave p�blica para `%s'\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "prefer�ncias actualizadas"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "mostra impress�o digital"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1841,155 -1435,120 +1840,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Op��o inv�lida.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "motivo da revoca��o: "
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Este comando n�o � permitido no modo %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Realmente assinar? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "sair deste menu"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "mostra esta ajuda"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "Nenhuma ajuda dispon�vel"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "muda a data de validade"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "muda os valores de confian�a"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "mostra impress�o digital"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "gerar um novo par de chaves"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
@@@ -1997,78 -1555,64 +1996,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output n�o funciona para este comando\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "imposs�vel abrir `%s'\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro na leitura do bloco de chave: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "chave `%s' n�o encontrada: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(a n�o ser que escolha a chave pela sua impress�o digital)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Remover esta chave do porta-chaves?"
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Esta chave � secreta! - apagar de qualquer modo? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "key"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Chave p�blica: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "informa��es de 'ownertrust' limpas\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
@@@ -2122,7 -1658,6 +2127,7 @@@ msgid "forcing symmetric cipher %s (%d
msgstr ""
"ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, 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"
@@@ -2205,291 -1724,244 +2210,311 @@@ msgstr "AVISO: dono pouco seguro em %s
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"A assinatura ser� marcada como n�o-revoc�vel.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "chave secreta n�o utiliz�vel"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ignorado: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[Utilizador n�o encontrado]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "mostra impress�o digital"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "chave `%s' n�o encontrada: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "op��es de importa��o inv�lidas\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NOME|usar NOME como chave secreta por omiss�o"
+
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "cifrar dados"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra sim�trica"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "decifrar dados (ac��o por omiss�o)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "verificar uma assinatura"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "listar as chaves"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "listar as chaves secretas"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "remover chaves do porta-chaves p�blico"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "remover chaves do porta-chaves secreto"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor de chaves"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importar chaves de um servidor de chaves"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "procurar chaves num servidor de chaves"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "actualizar todas as chaves a partir de um servidor de chaves"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importar/fundir chaves"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "actualizar a base de dados de confian�a"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, 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:502
++#: g10/gpg.c:513
#, 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:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "perguntar antes de sobrep�r"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2497,7 -1969,6 +2522,7 @@@ msgstr "
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2517,13 -1988,11 +2542,13 @@@ msgstr "
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2538,7 -2007,6 +2563,7 @@@ msgstr "
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2546,593 -2014,519 +2571,658 @@@ msgstr "
"\n"
"Algoritmos suportados:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Chave p�blica: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Dispers�o: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Compress�o: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [op��es] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostrar em que porta-chave a chave est�"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "desactiva uma chave"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "erro ao criar porta-chaves `%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, 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:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, 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:3134
++#: g10/gpg.c:3502
#, 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:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "prefer�ncias por omiss�o inv�lidas\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, 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:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-utilizador"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, 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:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "erro na cria��o da frase secreta: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
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:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "Remover esta chave do porta-chaves?"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "conflito de \"timestamp\""
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr ""
"|DF|escrever informa��es de estado para o\n"
"descritor de ficheiro DF"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3305,7 -2665,6 +3395,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: sem ID de utilizador\n"
@@@ -3315,7 -2673,6 +3405,7 @@@
msgid "key %s: %s\n"
msgstr "ignorado `%s': %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3338,7 -2691,6 +3428,7 @@@ msgstr "chave %08lX: sem IDs de utiliza
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
@@@ -3348,263 -2699,226 +3438,278 @@@
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: chave nova - ignorada\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "a escrever para `%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, 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:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, 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:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" n�o modificada\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, 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:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, 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:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, 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:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: ignorado ID de utilizador '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: subchave ignorada\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
@@@ -3631,61 -2941,52 +3736,66 @@@ msgstr "porta-chaves `%s' criado\n
msgid "keyring '%s' created\n"
msgstr "porta-chaves `%s' criado\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "erro na leitura de `%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[revoga��o]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[auto-assinatura]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 assinatura incorrecta\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d assinaturas incorrectas\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 assinatura n�o verificada por falta de chave\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 assinatura n�o verificada devido a um erro\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d assinaturas n�o verificadas devido a erros\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3698,63 -2999,53 +3808,68 @@@ msgstr "
"(vendo passaportes, verificando impress�es digitais...)?\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Confio moderadamente\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Confio plenamente\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " N�o foi poss�vel assinar.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Realmente assinar? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3763,11 -3054,9 +3878,11 @@@ msgstr "
"A sua auto-assinatura em \"%s\"\n"
"� uma assinatura do tipo PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3776,12 -3065,10 +3891,12 @@@ msgstr "
"A sua assinatura actual em \"%s\"\n"
"� uma assinatura local.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
#, fuzzy
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3790,44 -3077,35 +3905,44 @@@ msgstr "
"A sua assinatura actual em \"%s\"\n"
"� uma assinatura local.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
#, fuzzy
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada para assinar com a chave %08lX\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Esta chave expirou!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave vai expirar em %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3837,32 -3115,26 +3952,32 @@@ msgstr "
"pertence\n"
"� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) N�o vou responder.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) N�o verifiquei.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Verifiquei por alto.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Verifiquei com bastante cuidado.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr " i = mostrar mais informa��es\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3871,272 -3143,217 +3986,272 @@@ msgstr "
"Voc� tem certeza de que quer assinar esta chave com\n"
"a sua chave: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Isto ser� uma auto-assinatura.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"A assinatura ser� marcada como n�o-export�vel.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"A assinatura ser� marcada como n�o-revoc�vel.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"N�o verifiquei esta chave.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Verifiquei por alto esta chave.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Verifiquei esta chave com muito cuidado.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Realmente assinar? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "a mover a assinatura da chave para o local correcto\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "gravar e sair"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra impress�o digital"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Nota��o de assinatura: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "lista chave e identificadores de utilizadores"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "seleciona ID de utilizador N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "seleciona ID de utilizador N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "revoga assinaturas"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "assina a chave localmente"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "adiciona um novo ID de utilizador"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "adiciona um identificador fotogr�fico"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "remove ID de utilizador"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "remove uma chave secund�ria"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "adiciona uma chave de revoca��o"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "seleccionar o identificador do utilizador como prim�rio"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "lista prefer�ncias (perito)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "lista prefer�ncias (detalhadamente)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "muda a frase secreta"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revocar um ID de utilizador"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoga uma chave secund�ria"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "activa uma chave"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "desactiva uma chave"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostrar identificador fotogr�fico"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4144,268 -3361,211 +4259,268 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "A chave est� revogada."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Realmente assinar todos os IDs de utilizador? "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Realmente assinar todos os IDs de utilizador? "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "classe de assinatura desconhecida"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Este comando n�o � permitido no modo %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Realmente remover este ID de utilizador? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Realmente remover este ID de utilizador? "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Voc� quer realmente remover as chaves selecionadas? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Voc� quer realmente remover esta chave? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Realmente revocar este ID de utilizador? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Voc� quer realmente revogar esta chave? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Voc� quer realmente revogar as chaves selecionadas? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Voc� quer realmente revogar esta chave? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "configurar lista de prefer�ncias"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Realmente actualizar as prefer�ncias?"
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Gravar altera��es? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Sair sem gravar? "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Identificador de utilizador inexistente.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nada para assinar com a chave %08lX\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "'Digest': "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Caracter�sticas: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Nota��o: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Esta chave pode ser revogada pela chave %s "
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Esta chave pode ser revogada pela chave %s "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr " (sens�vel)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "imposs�vel criar %s: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "revkey"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr "[expira: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[expira: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " confian�a: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confian�a: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Esta chave foi desactivada"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4413,35 -3573,27 +4528,35 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "revkey"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4450,80 -3602,63 +4565,80 @@@ msgstr "
"AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
" algumas vers�o do PGP podem rejeit�-la.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Apagar esta assinatura v�lida? (s/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d assinatura removida.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d assinaturas removidas.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
#, fuzzy
msgid "invalid"
msgstr "armadura inv�lida"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4532,195 -3667,160 +4647,202 @@@ msgstr "
"AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
" algumas vers�o do PGP podem rejeit�-la.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Insira o ID de utilizador do revogador escolhido: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
#, fuzzy
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "A modificar a data de validade para uma chave secund�ria.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificar a data de validade para uma chave prim�ria.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Seleccione exactamente um identificador de utilizador.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Nota��o de assinatura: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Escrever por cima (s/N)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Nenhum ID de utilizador com �ndice %d\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de utilizador: \""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " assinado por %08lX em %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (n�o-export�vel)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " assinado por %08lX em %s%s\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Assinou estes identificadores de utilizadores:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (n�o-export�vel)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revogado por %08lX em %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Est� prestes a revogar estas assinaturas:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realmente criar os certificados de revoga��o? (s/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4763,14 -3855,10 +4885,14 @@@ msgstr "a escrever a auto-assinatura\n
msgid "writing key binding signature\n"
msgstr "a escrever a assinatura ligada a uma chave\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamanho da chave arredondado para %u bits\n"
@@@ -5069,41 -4108,36 +5191,46 @@@ msgstr "
msgid "Real name: "
msgstr "Nome completo: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Caracter inv�lido no nome\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "O nome n�o pode come�ar com um d�gito\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Endere�o de correio eletr�nico: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Endere�o eletr�nico inv�lido\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Coment�rio: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Caracter inv�lido no coment�rio\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5114,7 -4148,6 +5241,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
@@@ -5131,35 -4164,28 +5258,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Por favor corrija primeiro o erro\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5167,23 -4193,19 +5294,23 @@@ msgstr "
"Voc� precisa de uma frase secreta para proteger a sua chave.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Por favor digite a frase secreta \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5195,7 -4217,6 +5322,7 @@@ msgstr "
"qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5207,12 -4228,10 +5334,12 @@@ msgstr "
"gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
"uma hip�tese maior de ganhar entropia suficiente.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5220,58 -4239,47 +5347,58 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "%s' j� comprimido\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Criar mesmo assim?"
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Criar mesmo assim?"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Gera��o de chave cancelada.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "a escrever chave p�blica para `%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "chaves p�blica e privada criadas e assinadas.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5280,7 -4288,6 +5407,7 @@@ msgstr "
"Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5288,7 -4295,6 +5415,7 @@@ msgstr "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5296,248 -4302,196 +5423,248 @@@ msgstr "
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: chave secreta %08lX expirou em %s\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr ""
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politica de assinatura cr�tica: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politica de assinatura: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Nota��o de assinatura cr�tica: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Nota��o de assinatura: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 assinatura incorrecta\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d assinaturas incorrectas\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Porta-chaves"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ignorado `%s': %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Impress�o da chave prim�ria:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Impress�o da subchave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr "Impress�o da chave prim�ria:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Impress�o da subchave:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impress�o da chave ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "a verificar o porta chaves `%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu chave verificadas (%lu assinaturas)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu chave verificadas (%lu assinaturas)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: porta-chaves criado\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"assinado com a sua chave %08lX em %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
@@@ -5571,7 -4519,6 +5698,7 @@@ msgstr "dados cifrados com chave p�blic
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ou \""
@@@ -5618,263 -4556,211 +5745,263 @@@ msgstr "decifragem correcta\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome do ficheiro original='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Assinatura INCORRECTA de \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Assinatura expirada de \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "verifica��o de assinatura suprimida\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ou \""
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
#, fuzzy
msgid "Key available at: "
msgstr "Nenhuma ajuda dispon�vel"
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ou \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
#, fuzzy
msgid "binary"
msgstr "primary"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
#, fuzzy
msgid "unknown"
msgstr "vers�o desconhecida"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave p�blica desconhecido"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposs�vel verificar assinatura: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "n�o � uma assinatura separada\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "assinatura de classe 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "formato de assinatura antigo (PGP2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
"destinat�rio\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "algoritmo de criptografia n�o implementado"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
"destinat�rio\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: op��o depreciada \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor utilize \"%s%s\" em vez dela\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
#, fuzzy
msgid "Uncompressed"
msgstr "n�o processado"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "n�o processado"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "a ler op��es de `%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "classe de assinatura desconhecida"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6066,31 -4919,24 +6193,31 @@@ msgstr "Est� correto (s/n)?
msgid "unable to display photo ID!\n"
msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Nenhum motivo especificado"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "A chave foi substitu�da"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "A chave foi comprometida"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "A chave j� n�o � utilizada"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "O identificador do utilizador j� n�o � v�lido"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "motivo da revoca��o: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "coment�rio da revoca��o: "
@@@ -6104,100 -4950,81 +6231,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Nenhum valor de confian�a designado para:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " ou \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "Esta chave provavelmente pertence ao dono\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = N�o sei\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Eu N�O confio\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Confio de forma total\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = voltar ao menu principal\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = saltar esta chave\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " q = sair\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Decis�o? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Tem a certeza que quer confiar totalmente nesta chave?"
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificados que levam a uma chave confiada plenamente:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Esta chave provavelmente pertence ao dono\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Esta chave pertence-nos\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6209,118 -5036,93 +6336,118 @@@ msgstr "
"sim � pr�xima pergunta\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Usar esta chave de qualquer modo? "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
#, 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:546
++#: g10/pkclist.c:547
#, 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:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Isto pode significar que a assinatura � falsificada.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta chave foi desactivada.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Nota: Esta chave expirou!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " A assinatura � provavelmente uma FALSIFICA��O.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6328,75 -5130,58 +6455,75 @@@ msgstr "
"\n"
"Insira o identificador do utilizador. Termine com uma linha vazia: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Identificador de utilizador inexistente.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "A chave p�blica est� desativada.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "ignorado: a chave p�blica j� est� presente\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "nenhum endere�o v�lido\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Assinatura separada.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Por favor digite o nome do ficheiro de dados: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "lendo do \"stdin\" ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "n�o h� dados assinados\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "imposs�vel abrir dados assinados `%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "imposs�vel abrir dados assinados `%s'\n"
@@@ -6435,8 -5213,6 +6562,8 @@@ msgstr "NOTA: chave secreta %08lX expir
msgid "Note: key has been revoked"
msgstr "NOTA: a chave foi revogada"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, fuzzy, c-format
msgid "build_packet failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
@@@ -6446,44 -5221,40 +6573,50 @@@
msgid "key %s has no user IDs\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr ""
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr ""
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Chave secreta dispon�vel.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr ""
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, fuzzy, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
#, fuzzy
msgid "Revocation certificate created.\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6491,19 -5262,27 +6624,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "chave `%s' n�o encontrada: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6514,37 -5293,30 +6660,37 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:703
++#: g10/revoke.c:763
#, fuzzy
msgid "Please select the reason for the revocation:\n"
msgstr "motivo da revoca��o: "
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:756
++#: g10/revoke.c:816
#, fuzzy
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"\n"
"Insira o identificador do utilizador. Termine com uma linha vazia: "
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, fuzzy, c-format
msgid "Reason for revocation: %s\n"
msgstr "motivo da revoca��o: "
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Usar esta chave de qualquer modo? "
@@@ -6570,36 -5338,29 +6716,36 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostrar mais informa��es\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "a chave p�blica %08lX � %lu segundos mais nova que a assinatura\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6607,7 -5368,6 +6753,7 @@@ msgstr "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6615,29 -5375,24 +6761,29 @@@ msgstr "
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: a chave foi revogada"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"assumindo assinatura incorrecta na chave %08lX devido a um bit cr�tico "
"desconhecido\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
@@@ -6683,33 -5432,27 +6829,33 @@@ msgstr "
msgid "signing:"
msgstr "a assinar:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "ser� utilizada a cifragem %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ignorado `%s': duplicada\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
"para assinaturas!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@@ -6755,7 -5490,6 +6901,7 @@@ msgstr "%s: erro ao escrever registo d
msgid "read error in '%s': %s\n"
msgstr "armadura: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
@@@ -6784,7 -5513,6 +6930,7 @@@ msgstr "base de dados de confian�a rec
msgid "trustdb transaction too large\n"
msgstr "transa��o de base de dados de confian�a muito grande\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "imposs�vel fechar `%s': %s\n"
@@@ -6901,123 -5606,99 +7047,123 @@@ msgstr "imposs�vel manipular linhas de
msgid "input line longer than %d characters\n"
msgstr "linha de entrada maior que %d caracteres\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "`%s' n�o � um identificador longo de chave v�lido\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "chave %08lX: aceite como chave de confian�a\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confian�a\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"chave %08lX: nenhuma chave p�blica para chave de confian�a - ignorada\n"
"\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "chave marcada como de confian�a absoluta\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "registo de confian�a %lu, tipo req %d: falha na leitura: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "chave p�blica %08lX n�o encontrada: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr ""
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "a verificar a base de dados de confian�a\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr ""
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
#, fuzzy
msgid "no ultimately trusted keys found\n"
msgstr ""
"chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@@ -7253,11 -5885,9 +7399,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7398,12 -6000,10 +7544,12 @@@ msgstr "assinatura %s de: \"%s\"\n
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@@ -7424,7 -6021,6 +7570,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7484,12 -6068,10 +7630,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7923,7 -6413,6 +8069,7 @@@ msgstr "erro ao criar porta-chaves `%s'
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8522,7 -6891,6 +8668,7 @@@ msgstr "certificado incorrecto
msgid " runtime cached certificates: %u\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
@@@ -8532,8 -6899,6 +8678,8 @@@
msgid "certificate cached\n"
msgstr "prefer�ncia %c%lu duplicada\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
@@@ -8594,7 -6948,6 +8740,7 @@@ msgstr "remo��o do bloco de chave falho
msgid "not removing file '%s'\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -8819,218 -7128,175 +8965,218 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr ""
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
msgid "ksba_crl_parse failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "a escrever para `%s'\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "gerar um certificado de revoga��o"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "verifica��o de assinatura suprimida\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "verifica��o da assinatura criada falhou: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "%s: imposs�vel criar directoria: %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "%s: imposs�vel criar directoria: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "a escrever para `%s'\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr ""
"AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: erro ao ler registo livre: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? problema ao verificar revoga��o: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "verifica��o da assinatura criada falhou: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
@@@ -9076,75 -7332,59 +9222,75 @@@ msgstr "erro ao criar `%s': %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "erro na leitura de `%s': %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "chave `%s' n�o encontrada: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "certificado incorrecto"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "certificado incorrecto"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "certificado incorrecto"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "certificado incorrecto"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Insira o ID de utilizador do revogador escolhido: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9152,226 -7392,155 +9298,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "imposs�vel ligar a `%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "prefer�ncia %c%lu duplicada\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOTA: a chave foi revogada"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "imposs�vel 'stat' a `%s': %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "imposs�vel ligar a `%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmos suportados:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "Sair sem gravar? "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9384,91 -7553,72 +9503,91 @@@ msgstr "
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [op��es] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "frase secreta demasiado longa\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "armadura: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "n�o processado"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9721,12 -7820,10 +9840,12 @@@ msgstr "a procurar por \"%s\" no servid
msgid "malloc failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9761,11 -7852,10 +9880,12 @@@ msgstr "erro na leitura de `%s': %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "chave `%s' n�o encontrada: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9912,72 -7972,61 +10032,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, 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:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10236,11 -8225,9 +10361,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/ro.gmo
index 1a2521b,0000000..57994b3
mode 100644,000000..100644
Binary files differ
diff --cc po/ro.po
index 391f30b,92cd9b6..c7040b2
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz at rolix.org>\n"
"Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@@ -72,7 -61,6 +72,7 @@@ msgstr "fraz�-parol� invalid�
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
#, fuzzy
msgid "Quality:"
msgstr "validitate: %s"
@@@ -83,17 -71,14 +83,17 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
@@@ -101,58 -86,45 +101,58 @@@
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "fraz�-parol� incorect�"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "linie prea lung�"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "fraz�-parol� prea lung�\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Caracter invalid �n nume\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "MPI incorect"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "fraz�-parol� incorect�"
@@@ -162,25 -133,11 +162,25 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -255,14 -199,12 +255,14 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "%s: am e�uat s� creez hashtable: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
#, fuzzy
msgid "Please insert the card with serial number"
msgstr ""
"V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de serie:\n"
" %.*s\n"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
#, fuzzy
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -408,42 -324,28 +408,42 @@@ msgstr "
"Op�iuni:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "locvace"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "fii oarecum mai t�cut"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -528,11 -413,6 +528,11 @@@ msgstr "nu este suportat(�)
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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"
@@@ -548,146 -426,108 +548,145 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nu pot crea `%s': %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "scriu cheia secret� �n `%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 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:1852
++#: agent/gpg-agent.c:1837
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) a e�uat �n %s: %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: nu pot crea director: %s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualizarea secretului a e�uat: %s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: s�rit�: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
@@@ -703,8 -541,6 +702,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -712,9 -548,6 +711,9 @@@ msgstr "
"@Comenzi:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -771,7 -596,6 +770,7 @@@ msgstr "anulat�
msgid "error while asking for the passphrase: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "eroare �n `%s': %s\n"
@@@ -956,8 -746,6 +955,8 @@@ msgstr "eroare la crearea frazei-parol�
msgid "error creating a stream for a pipe: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eroare la citire `%s': %s\n"
@@@ -1109,7 -865,6 +1108,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1129,7 -881,6 +1128,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1424,7 -1115,6 +1423,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "nefor�at(�)"
@@@ -1606,19 -1258,14 +1605,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "Introduce�i fraza-parol�: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "cardul OpenPGP nu e disponibil: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "cardul OpenPGP nr. %s detectat\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "nu pot face acest lucru �n modul batch\n"
@@@ -1632,210 -1277,159 +1631,210 @@@ msgstr "Aceast� comand� nu este permis
msgid "Reset Code not or not anymore available\n"
msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Selec�ia d-voastr�? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[nesetat(�)]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "masculin"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "feminin"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "nespecificat(�)"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "nefor�at(�)"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "for�at(�)"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Numele de familie al proprietarului cardului: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Prenumele proprietarului cardului: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "URL pentru a aduce cheia public�: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Date login (nume cont): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Date DO personale: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Preferin�e limb�: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Eroare: r�spuns invalid.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "Amprenta CA: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Eroare: amprent� formatat� invalid.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "opera�ia pe cheie nu e posibil�: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "nu este un card OpenPGP"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "�nlocuiesc cheia existent�? (d/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Ce lungime de cheie dori�i? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Ce lungime de cheie dori�i? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Ce lungime de cheie dori�i? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rotunjit� prin adaos la %u bi�i\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "cheia secret� deja stocat� pe un card\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "�nlocuiesc cheile existente? (d/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1850,143 -1444,108 +1849,143 @@@ msgstr "
" PIN = `%s' PIN Admin = `%s'\n"
"Ar trebui s� le schimba�i folosind comanda --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Cheie de semnare\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Cheie de cifrare\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Cheie de autentificare\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Selec�ie invalid�.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "cheia secret� deja stocat� pe un card\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Dori�i s�-l semna�i? (d/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "ie�i din acest meniu"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "arat� comenzi administrare"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "afi�eaz� acest mesaj"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "afi�eaz� toate datele disponibile"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "schimb� numele purt�torului cardului"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "schimb� URL-ul de unde s� fie adus� cheia"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "adu cheia specificat� de URL-ul de pe card"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "schimb� numele de login"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "schimb� preferin�ele de limb�"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "schimb� sexul purt�torului cardului"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "schimb� o amprent� CA"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "comut� fanionul PIN de for�are a semn�turii"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "genereaz� noi chei"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "meniu pentru a schimba sau debloca PIN-ul"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "verific� PIN-ul �i listeaz� toate datele"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "Comand� numai-administrare\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Sunt permise comenzi administrare\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Nu sunt permise comenzi administrare\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Comand� invalid� (�ncerca�i \"ajutor\")\n"
@@@ -1994,77 -1552,64 +1993,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output nu merge pentru aceast� comand�\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nu pot deschide `%s'\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eroare la citire keyblock: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "nu pot face acest lucru �n mod batch f�r� \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "�terge aceast� cheie din inelul de chei? (d/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Aceasta este o cheie secret�! - chiar dori�i s� o �terge�i? (d/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "cheie"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Pubkey: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "informa�ii �ncredere-proprietar cur��ate\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "exist� o cheie secret� pentru cheia public� \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr ""
"folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
"�nt�i.\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
@@@ -2118,7 -1655,6 +2124,7 @@@ msgstr "
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:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, 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"
@@@ -2207,283 -1727,236 +2213,303 @@@ msgstr "AVERTISMENT: nu pot �terge fi�i
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "cheie secret� de nefolosit"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "exportul cheilor secrete nu este permis\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: s�rit�: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "AVERTISMENT: nimic exportat\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[ID utilizator nu a fost g�sit]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "Amprenta CA: "
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "op�iuni enumerare invalide\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "|[fi�ier]|creaz� o semn�tur�"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "creaz� o semn�tur� deta�at�"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "cifreaz� datele"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "cifreaz� numai cu cifru simetric"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "decripteaz� datele (implicit)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "verific� o semn�tur�"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "enumer� chei"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "enumer� chei �i semn�turi"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "enumer� �i verific� semn�turile cheii"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "enumer� chei �i amprente"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "enumer� chei secrete"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "genereaz� un certificat de revocare"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "�terge chei de pe inelul de chei public"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "�terge chei de pe inelul de chei secret"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "semneaz� o cheie"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "semneaz� o cheie local"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "semneaz� o cheie"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "semneaz� o cheie local"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "semneaz� sau editeaz� o cheie"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "schimb� fraza-parol�"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "export� chei"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "export� chei pentru un server de chei"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "import� chei de la un server de chei"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "caut� pentru chei pe un server de chei"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "actualizeaz� toate cheile de la un server de chei"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "import�/combin� chei"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "afi�eaz� starea cardului"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "schimb� data de pe card"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "schimb� PIN-ul unui card"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "actualizeaz� baza de date de �ncredere"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "creaz� ie�ire �n armur� ascii"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NUME|cifrare pentru NUME"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, 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:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "folose�te modul text canonic"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "�ntreab� �nainte de a suprascrie"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "folose�te comportament strict OpenPGP"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2491,7 -1964,6 +2517,7 @@@ msgstr "
"@\n"
"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2511,13 -1983,11 +2537,13 @@@ msgstr "
" --list-keys [nume] arat� chei\n"
" --fingerprint [nume] arat� amprente\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2532,7 -2002,6 +2558,7 @@@ msgstr "
"sign, check, encrypt sau decrypt\n"
"opera�iunea implicit� depinde de datele de intrare\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2540,78 -2009,64 +2566,78 @@@ msgstr "
"\n"
"Algoritmuri suportate:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Cifru: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Compresie: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "folosire: gpg [op�iuni] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "comenzi �n conflict\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2619,7 -2074,6 +2645,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2629,7 -2083,6 +2655,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
"configurare `%s'\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2637,7 -2090,6 +2663,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2645,7 -2097,6 +2671,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2656,7 -2107,6 +2682,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
"configurare `%s'\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2664,495 -2114,441 +2690,561 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "articol configurare necunoscut `%s'\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, 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:1869
++#: g10/gpg.c:1885
#, 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:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "deactiveaz� cheia"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option `%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "op�iune necunoscut� `%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "op�iune necunoscut� `%s'\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op�iuni server de chei invalide\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "op�iuni server de chei invalide\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op�iuni import invalide\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "op�iuni import invalide\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op�iuni export invalide\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "op�iuni export invalide\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op�iuni enumerare invalide\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "op�iuni enumerare invalide\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "op�iuni verificare invalide\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execu�ie ca %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm compresie selectat este invalid\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "preferin�e implicite invalide\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "preferin�e cifrare personale invalide\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "preferin�e rezumat personale invalide\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "preferin�e compresie personale invalide\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge �nc� cu %s!\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "algoritm hash invalid `%s'\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "algoritm hash invalid `%s'\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [nume_fi�ier]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [nume_fi�ier]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, 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:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [nume_fi�ier]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
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:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [nume_fi�ier]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
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:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nume_fi�ier]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [nume_fi�ier]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [nume_fi�ier]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizator"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizator"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizator [comenzi]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-utilizator"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei e�uat�: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recep�ie server de chei e�uat�: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie e�uat: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "c�utare server de chei e�uat�: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei e�uat�: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a e�uat: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a e�uat: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "eroare la ob�inerea num�rului serial: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[nume_fi�ier]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "ia cheile de pe acest inel de chei"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "d� numai un avertisment la conflicte de timestamp"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|scrie informa�ii de stare �n acest FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3331,7 -2693,6 +3423,7 @@@ msgstr "
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:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "cheia %s: nici un ID utilizator\n"
@@@ -3342,7 -2702,6 +3434,7 @@@
msgid "key %s: %s\n"
msgstr "s�rit� \"%s\": %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3365,7 -2720,6 +3457,7 @@@ msgstr "cheia %s: nici un ID utilizato
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
@@@ -3375,261 -2728,224 +3467,276 @@@
msgid "key %s: new key - skipped\n"
msgstr "cheia %s: cheie nou� - s�rit�\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, 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:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "scriu �n `%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "cheia %s: cheia public� \"%s\" importat�\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, 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:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "cheia %s: \"%s\" %d noi subchei\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "cheia %s: cheie secret� importat�\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, 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:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "importul de chei secrete nu este permis\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, 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:2011
++#: g10/import.c:2053
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "cheia %s: legare subcheie invalid�\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "cheia %s: revocare de subcheie invalid�\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "cheia %s: am s�rit subcheia\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
@@@ -3656,62 -2968,53 +3763,67 @@@ msgstr "inelul de chei `%s' creat\n
msgid "keyring '%s' created\n"
msgstr "inelul de chei `%s' creat\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "resurs� keyblock `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "eroare �n `%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[revocare]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[auto-semn�tur�]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 semn�tur� incorect�\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d semn�turi incorecte\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3722,17 -3025,14 +3834,17 @@@ msgstr "
"pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
"verific�nd amprentele din diferite surse, etc.)\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Am o �ncredere marginal�\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Am toat� �ncrederea\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3742,47 -3042,40 +3854,52 @@@ msgstr "
"O ad�ncime mai mare de 1 permite ca cheia pe care o semna�i s� fac�\n"
"semn�turi de �ncredere �n numele d-voastr�.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
"ap�sa�i enter pentru niciunul.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Nu pot semna.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID utilizator \"%s\" este expirat."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID-ul utilizator \"%s\" poate fi semnat. "
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Dori�i s�-l semna�i? (d/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3791,11 -3084,9 +3908,11 @@@ msgstr "
"Auto-semn�tura pe \"%s\"\n"
"este o semn�tur� stil PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3804,12 -3095,10 +3921,12 @@@ msgstr "
"Semn�tura d-voastr� curent� pe \"%s\"\n"
"a expirat.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3818,43 -3107,34 +3935,43 @@@ msgstr "
"Semn�tura d-voastr� curent� pe \"%s\"\n"
"semn�tur� local�.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nimic de semnat cu cheia %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Aceast� cheie a expirat!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Aceast� cheie va expira pe %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3865,33 -3145,27 +3982,33 @@@ msgstr "
"�ntr-adev�r persoanei numite deasupra? Dac� nu �ti�i ce s� r�spunde�i,\n"
"introduce�i \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nu voi r�spunde.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nu am verificat deloc.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Am f�cut ceva verific�ri superficiale.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Am f�cut verific�ri foarte atente.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3900,232 -3174,177 +4017,232 @@@ msgstr "
"Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
"aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Aceasta va fi o auto-semn�tur�.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Nu am verificat aceast� cheie deloc.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "Am verificat aceast� cheie superficial.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "Am verificat aceast� cheie foarte atent.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
"parol� de schimbat.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "mut o semn�tur� de cheie �n locul corect\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "salveaz� �i termin�"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "afi�eaz� amprenta cheii"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Notare semn�tur�: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "enumer� chei �i ID-uri utilizator"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "selecteaz� ID utilizator N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "selecteaz� subcheia N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "verific� semn�turi"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
"relevante]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "adaug� un ID utilizator"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "adaug� o poz� ID"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "�terge ID-urile utilizator selectate"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "adaug� o subcheie"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "adaug� o cheie la un smartcard"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "mut� o cheie pe un smartcard"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "mut� o cheie de rezerv� pe un smartcard"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "�terge subcheile selectate"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "adaug� o cheie de revocare"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "marcheaz� ID-ul utilizator selectat ca primar"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "enumer� preferin�ele (expert)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "afi�eaz� preferin�ele (detaliat)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
"selectate"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "schimb� fraza-parol�"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "schimb� �ncrederea pentru proprietar"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "revoc� ID-urile utilizator selectate"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "revoc� cheia sau subcheile selectate"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "activeaz� cheia"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "deactiveaz� cheia"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "arat� pozele pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Cheia secret� este disponibil�.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4144,259 -3363,203 +4261,260 @@@ msgstr "
" pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
" (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Cheia este revocat�."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Tip de semn�tur� necunoscut `%s'\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Trebuie s� selecta�i exact o cheie.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "Nu pot deschide `%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr ""
"Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
"de �ncredere furnizat� de utilizator\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Seteaz� lista de preferin�e ca:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
"selectate? (d/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Salva�i schimb�rile? (d/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Termina�i f�r� a salva? (d/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "amprent� invalid�"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "am e�uat s� stochez amprenta: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Nu exist� acest ID utilizator.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Nimic de semnat cu cheia %s\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Rezumat: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Capabilit��i: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Server de chei no-modify"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Server de chei preferat: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Nota�ie:"
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr " (senzitiv)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "creat�: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "revocat�: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "expirat�: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "expir�: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "folosire: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "nr-card: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "�ncredere: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "validitate: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Aceast� cheie a fost deactivat�"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4405,17 -3568,12 +4523,17 @@@ msgstr "
"corect� dac� nu reporni�i programul.\n"
#
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "revocat�"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "expirat�"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4424,17 -3582,14 +4542,17 @@@ msgstr "
" Aceast� comand� poate cauza ca un alt ID utilizator\n"
" s� devin� ID-ul utilizator primar presupus.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4443,78 -3598,61 +4561,78 @@@ msgstr "
"AVERTISMENT: Aceasta este o cheie stil PGP2. Ad�ugarea unei poze ID poate\n"
" cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Am �ters %d semn�turi.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Am �ters %d semn�turi.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Nu am �ters nimic.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "invalid(�)"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4524,192 -3662,163 +4642,205 @@@ msgstr "
" desemnat poate face ca unele versiuni de PGP s� resping� "
"cheia.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
"anulat�!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
"desemnat? (d/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
+ "desemnat? (d/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Schimb timpul de expirare pentru o subcheie.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
"certified)\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Introduce�i URL-ul serverului de chei preferat: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Notare semn�tur�: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Suprascriu? (d/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nici un ID utilizator cu indicele %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Nici un ID utilizator cu hash-ul %s\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Nici o subcheie cu indicele %d\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "Nici o subcheie cu indicele %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID utilizator: \"%s\"\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (non-exportabil�)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aceast� semn�tur� a expirat pe %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (non-revocabil�)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocat� de cheia d-voastr� %s pe %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "nici o cheie secret�\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Cheia %s este deja revocat�.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Subcheia %s este deja revocat�.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
@@@ -4750,14 -3851,10 +4881,14 @@@ msgstr "scriu auto semn�tur�\n
msgid "writing key binding signature\n"
msgstr "scriu semn�tur� legat� de cheie\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "lungime cheie rotunjit� la %u bi�i\n"
@@@ -5051,41 -4099,36 +5182,46 @@@ msgstr "
msgid "Real name: "
msgstr "Nume real: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Caracter invalid �n nume\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Numele nu poate �ncepe cu o cifr�\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Adres� de email: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Nu este o adres� de email valid�\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Comentariu: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Caracter invalid �n comentariu\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Folosi�i setul de caractere `%s'\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5096,7 -4139,6 +5232,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
@@@ -5111,35 -4153,28 +5247,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoTt"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5147,7 -4182,6 +5283,7 @@@ msgstr "
"Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@@ -5155,16 -4189,13 +5291,16 @@@
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5175,7 -4206,6 +5311,7 @@@ msgstr "
"O s� o fac oricum. Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
"program cu op�iunea \"--edit-key\".\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5187,12 -4217,10 +5323,12 @@@ msgstr "
"�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
"numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a e�uat: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5200,59 -4228,48 +5336,59 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "cheia exist� deja\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Crea�i oricum? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Crea�i oricum? "
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Generarea cheii a fost anulat�.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "scriu cheia public� �n `%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "cheile secret� �i public� au fost create �i semnate.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5262,7 -4279,6 +5398,7 @@@ msgstr "
"s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
"pentru acest scop.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5270,7 -4286,6 +5406,7 @@@ msgstr "
"cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5278,246 -4293,194 +5414,246 @@@ msgstr "
"cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Crea�i �ntr-adev�r? (d/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "stocarea cheii pe card a e�uat: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "niciodat� "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politic� de semn�turi critic�: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politic� de semn�turi: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Server de chei preferat critic: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notare semn�tur� critic�: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notare semn�tur�: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 semn�tur� incorect�\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d semn�turi incorecte\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Inel de chei"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "s�rit� \"%s\": %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Amprent� cheie primar�:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Amprent� subcheie:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Amprent� cheie primar�:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Amprent� subcheie:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Amprent� cheie ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " Card nr. serie ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, 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:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu chei puse �n cache (%lu semn�turi)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: inelul de chei creat\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "Introduce�i URL-ul serverului de chei preferat: "
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "deactivat(�)"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "reactualizez 1 cheie de la %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "reactualizez %d chei de la %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "cer cheia %s de la serverul %s %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "cer cheia %s de la %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "trimit cheia %s serverului %s %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "trimit cheia %s lui %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "cer cheia %s de la %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
@@@ -5551,7 -4508,6 +5687,7 @@@ msgstr "date cigrate cu cheie public�:
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
@@@ -5597,260 -4544,209 +5733,261 @@@ msgstr "decriptare OK\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "decriptarea a e�uat: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nume fi�ier original='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Semn�tur� bun� din \"%s\""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Semn�tur� INCORECT� din \"%s\""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Semn�tur� expirat� din \"%s\""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "Semn�tur� bun� din \"%s\""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "verificare semn�tur� eliminat�\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "nu pot m�nui aceste semn�turi multiple\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Semn�tur� f�cut� %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " folosind cheia %s %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Cheie disponibil� la: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[nesigur]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " aka \"%s\""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Semn�tur� expirat� %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Semn�tura expir� %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binar"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "modtext"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "necunoscut"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritm pubkey necunoscut"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nu pot verifica semn�tura: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "nu o semn�tur� deta�at�\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, 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:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
#| msgid "fstat of `%s' failed in %s: %s\n"
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) a e�uat �n %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "semn�tur� %s, algoritm rezumat %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Necompresat"
#
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "necompresat|niciunul"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "op�iune ambigu� `%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "op�iune necunoscut� `%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type `%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Tip de semn�tur� necunoscut `%s'\n"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6055,31 -4918,24 +6192,31 @@@ msgstr "Este aceast� poz� corect� (d/N/
msgid "unable to display photo ID!\n"
msgstr "nu pot afi�a poza ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Nici un motiv specificat"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Cheia este �nlocuit�"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Cheia a fost compromis�"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Cheia nu mai este folosit�"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "ID utilizator nu mai este valid"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "motiv pentru revocare: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "comentariu revocare: "
@@@ -6093,54 -4949,43 +6230,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMtTsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Nici o valoare de �ncredere atribuit� lui:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " aka \"%s\"\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"C�t de mult crede�i c� aceast� cheie apar�ine �ntr-adev�r utilizatorului "
"numit?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Nu �tiu sau nu vreau s� m� pronun�\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NU am �ncredere\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Am �ncredere suprem�\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = �napoi la meniul principal\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = s�ri peste cheia asta\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " t = termin�\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6149,42 -4994,34 +6286,42 @@@ msgstr "
"Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Decizia d-voastr�? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr ""
"Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? (d/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
"utilizatorului numit\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
"utilizatorului numit\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Aceast� cheie apar�ine probabil utilizatorului numit\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Aceast� cheie ne apar�ine\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6194,116 -5031,91 +6331,116 @@@ msgstr "
"utilizator. Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
"r�spunde cu da la urm�toarea �ntrebare.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "Folosi�i oricum aceast� cheie? (d/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Not�: Aceast� cheie a expirat!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Semn�tura este probabil un FALS.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: s�rit�: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: s�rit�: cheia public� este deactivat�\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Destinatari curen�i:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6311,76 -5123,59 +6448,76 @@@ msgstr "
"\n"
"Introduce�i ID-ul utilizator. Termina�i cu o linie nou�: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Nu exist� acest ID utilizator.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Cheia public� este deactivat�.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "s�rit�: cheia public� setat� deja\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatar implicit necunoscut \"%s\"\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "nici un destinatar valid\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, 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:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "cheia %s nu are nici un ID utilizator\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Semn�tur� deta�at�.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "V� rug�m introduce�i numele fi�ierului de date: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "citesc stdin ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "nici o dat� semnat�\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "nu pot deschide date semnate `%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nu pot deschide date semnate `%s'\n"
@@@ -6422,8 -5210,6 +6559,8 @@@ msgstr "NOT�: cheia secret� %s a expira
msgid "Note: key has been revoked"
msgstr "NOT�: cheia a fost revocat�"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet a e�uat: %s\n"
@@@ -6433,43 -5218,39 +6570,49 @@@
msgid "key %s has no user IDs\n"
msgstr "cheia %s nu are nici un ID utilizator\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Pentru a fi revocat de:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Cheia secret� este disponibil�.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "Ie�ire �n armur� ASCII for�at�.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet a e�uat: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Certificat de revocare creat.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6477,18 -5258,27 +6620,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6506,33 -5296,26 +6663,33 @@@ msgstr "
"caz c� mediumul este deteriorat. Dar fi�i atent: sistemul de tip�rire al\n"
"ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Renun��"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Motiv pentru revocare: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Nici o descriere dat�)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Este aceasta OK? (d/N) "
@@@ -6555,40 -5334,33 +6712,40 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
"AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
"certified)\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = arat�-mi mai multe informa�ii\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"AVERTISMENT: subcheia de semnare %s are o certificare-reciproc� invalid� "
"(invalid cross-certification)\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "cheie public� %s este mai nou� cu %lu secunde dec�t semn�tura\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6596,7 -5368,6 +6753,7 @@@ msgstr "
"cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6604,30 -5375,25 +6761,30 @@@ msgstr "
"cheia %s a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "NOT�: cheia semn�turii %s a expirat %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOT�: cheia a fost revocat�"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"presupun semn�tur� incorect� din cheia %s datorit� unui bit critic "
"necunoscut\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
@@@ -6672,31 -5432,25 +6829,31 @@@ msgstr "
msgid "signing:"
msgstr "semnare:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "va fi folosit� cifrarea %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "s�rit� \"%s\": duplicat�\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "s�rit�: cheia secret� deja prezent�\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"aceasta este o cheie ElGamal generat� de PGP care nu e sigur� pentru "
"semn�turi!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
@@@ -6744,7 -5490,6 +6901,7 @@@ msgstr "eroare g�sire �nregistrare �ncr
msgid "read error in '%s': %s\n"
msgstr "eroare citire �n `%s': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sincronizarea a e�uat: %s\n"
@@@ -6775,7 -5515,6 +6932,7 @@@ msgstr "trustdb rec %lu: scrierea a e�u
msgid "trustdb transaction too large\n"
msgstr "tranzac�ia trustdb prea mare\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -6893,123 -5609,99 +7050,123 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "`%s' nu este un ID-cheie de lungime valid�\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "cheia %s: acceptat� ca cheie de �ncredere\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "cheia %s apare de mai multe ori �n trustdb\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "cheia %s: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "cheia %s marcat� ca av�nd �ncredere suprem�\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "�nregistrare �ncredere %lu, tip req %d: citirea a e�uat: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"nu pot folosi model de �ncredere (%d) - presupun model de �ncredere %s\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "folosesc model de �ncredere %s\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "nu e nevoie de o verificare trustdb\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "urm�toarea verificare trustdb programat� pe %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
#| msgid "no need for a trustdb check with `%s' trust model\n"
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "nu e nevoie de o verificare trustdb cu modelul de �ncredere `%s'\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
#| msgid "no need for a trustdb update with `%s' trust model\n"
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "cheia public� %s nu a fost g�sit�: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "v� rug�m face�i un --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "verific trustdb\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
"%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
"ad�nc: %d valid: %3d semnat: %3d �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7247,11 -5890,9 +7404,11 @@@ msgstr "PIN-ul pentru CHV%d este prea s
msgid "verify CHV%d failed: %s\n"
msgstr "verificarea CHV%d a e�uat: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "eroare la recuperarea st�rii CHV de pe card\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "cardul este �ncuiat permanent!\n"
@@@ -7387,13 -6000,11 +7544,13 @@@ msgstr "semn�tur� %s, algoritm rezumat
msgid "signatures created so far: %lu\n"
msgstr "semn�turi create p�n� acum: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@@ -7415,7 -6023,6 +7572,7 @@@ msgstr "|N|PIN Nou
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7475,12 -6070,10 +7632,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7915,7 -6416,6 +8072,7 @@@ msgstr "eroare la crearea inelului de c
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "Generarea cheii a e�uat: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8515,7 -6895,6 +8672,7 @@@ msgstr "certificat incorect
msgid " runtime cached certificates: %u\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "Certificat de revocare creat.\n"
@@@ -8525,8 -6903,6 +8682,8 @@@
msgid "certificate cached\n"
msgstr "preferin�a `%s' duplicat�\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
@@@ -8589,7 -6954,6 +8746,7 @@@ msgstr "citirea cheii publice a e�uat:
msgid "not removing file '%s'\n"
msgstr "punerea armurii a e�uat: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "eroare �n `%s': %s\n"
@@@ -8818,187 -7138,151 +8975,187 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "r�spuns invalid de la agent\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "nu pot deschide fi�ierul: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "citirea cheii publice a e�uat: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet a e�uat: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting CRL item: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "%s: eroare scriere �nregistrare dir: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "genereaz� un certificat de revocare"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "verificare semn�tur� eliminat�\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "verificarea semn�turii create a e�uat: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "nu pot crea directorul `%s': %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "nu pot crea directorul `%s': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "actualizarea secretului a e�uat: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "%s: eroare scriere �nregistrare dir: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
@@@ -9006,36 -7290,29 +9163,36 @@@ msgstr "
"AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi "
"folosit�\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: eroare citire �nregistrare liber�: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? probleme la verificare revoc�rii: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "verificarea semn�turii create a e�uat: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "citirea cheii publice a e�uat: %s\n"
@@@ -9082,75 -7349,59 +9239,75 @@@ msgstr "eroare la creearea `%s': %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "eroare la citire `%s': %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "Certificat de revocare creat.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "certificat incorect"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "certificat incorect"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "certificat incorect"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "certificat incorect"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9158,229 -7409,158 +9315,202 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "nu m� pot conecta la `%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "loading CRL '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "preferin�a `%s' duplicat�\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOT�: cheia a fost revocat�"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "nu pot ob�ine statistici `%s': %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: am e�uat s� creez hashtable: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "gpg-agent versiune protocol %d nu este suportat\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "nu m� pot conecta la `%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmuri suportate:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, 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:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
#
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9393,95 -7573,76 +9523,95 @@@ msgstr "
"@\n"
"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "folosire: gpg [op�iuni] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, 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:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "linie prea lung�"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "amprent� invalid�"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, 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:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "nefor�at(�)"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9741,12 -7851,10 +9871,12 @@@ msgstr "trimit cheia %s serverului %s %
msgid "malloc failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9782,11 -7884,10 +9912,12 @@@ msgstr "eroare la citire `%s': %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9935,73 -8006,62 +10066,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, 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:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s: am e�uat s� creez hashtable: %s\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10259,11 -8259,9 +10395,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/ru.gmo
index 0c6b348,0000000..f440441
mode 100644,000000..100644
Binary files differ
diff --cc po/ru.po
index ee07c25,1744217..6ac82ba
--- a/po/ru.po
+++ b/po/ru.po
@@@ -11,7 -11,6 +11,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GnuPG 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2015-08-12 17:17+0000\n"
"Last-Translator: Ineiev <ineiev at gnu.org>\n"
"Language-Team: Russian <gnupg-ru at gnupg.org>\n"
@@@ -71,7 -60,6 +71,7 @@@ msgstr "|pinentry-tt|Скрывать �
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Стойкость:"
@@@ -81,74 -69,56 +81,72 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Стойкость введенного выше текста. Проконсультируйтесь у администратора о "
"критериях оценки стойкости."
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
- msgstr ""
- "Введите PIN, чтобы сделать закрытый ключ доступным на протяжении этого сеанса"
+ msgstr "Введите PIN, чтобы сделать секретный ключ доступным в этом сеансе"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
- "Введите фразу-пароль, чтобы сделать закрытый ключ доступным на протяжении "
- "этого сеанса"
+ "Введите фразу-пароль, чтобы сделать секретный ключ доступным в этом сеансе"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr "PIN:"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Фраза-пароль:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "не подходит - попробуйте еще раз"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (попытка %d из %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr "Повторите:"
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "Слишком длинный PIN"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Слишком длинная фраза-пароль"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "Недопустимый символ в PIN"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "Слишком короткий PIN"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "Неверный PIN"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Неверная фраза-пароль"
@@@ -157,24 -126,10 +155,24 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не могу создать '%s': %s\n"
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не могу открыть '%s': %s\n"
@@@ -241,19 -184,16 +239,19 @@@ 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"
+ "Введите фразу-пароль для защиты полученного секретного ключа%%0A %s%%0A "
+ "%s%%0Aвнутри хранилища ключей агента gpg"
+#: agent/command-ssh.c:3614
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "сбой создания потока из сокета: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "Вставьте карту с серийным номером"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "Удалите текущую карту и вставьте карту с серийным номером"
@@@ -394,41 -308,27 +392,41 @@@ msgstr "
"@Параметры:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "запуск в режиме демона (фоновый режим)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "запуск в режиме сервера (нефоновый режим)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "подробно"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "сократить подробности"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "вывод команд в стиле sh"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "вывод команд в стиле csh"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FILE|взять параметры из файла FILE"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "не отсоединяться от консоли"
@@@ -503,11 -386,6 +501,11 @@@ msgstr "включить поддерж
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
@@@ -521,140 -397,102 +519,139 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
"Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
- "Управление закрытыми ключами для @GNUPG@\n"
+ "Управление секретными ключами для @GNUPG@\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "запрошен недопустимый уровень отладки '%s'\n"
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
- #: agent/gpg-agent.c:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметров '%s': %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "чтение параметров из '%s'\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Замечание: '%s' не считается параметром\n"
- #: agent/gpg-agent.c:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "не могу создать сокет: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "слишком длинное имя сокета '%s'\n"
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
- #: agent/gpg-agent.c:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "ошибка получения разового кода для сокета\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "ошибка связывания сокета с '%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "сбой listen(): %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "слушаем сокет '%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "не могу создать каталог '%s': %s\n"
- #: agent/gpg-agent.c:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "создан каталог '%s'\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "сбой stat() для '%s': %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "невозможно использовать '%s' как домашний каталог\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "обработчик 0x%lx для файлового дескриптора %d запущен\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обработчик 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d запущен\n"
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s остановлен\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "в этом сеансе агент gpg не работает\n"
@@@ -671,8 -507,6 +668,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
"Работа с буфером паролей\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -680,9 -514,6 +677,9 @@@ msgstr "
"@Команды:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -702,9 -531,8 +699,9 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
"Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
- "Средство работы с закрытыми ключами\n"
+ "Средство работы с секретными ключами\n"
+#: agent/protect-tool.c:683
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Введите фразу-пароль для снятия защиты с объекта PKCS#12."
@@@ -736,7 -559,6 +733,7 @@@ msgstr "отменено\n
msgid "error while asking for the passphrase: %s\n"
msgstr "ошибка запроса ввода фразы-пароля: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, c-format
msgid "error opening '%s': %s\n"
msgstr "ошибка открытия '%s': %s\n"
@@@ -888,11 -685,9 +885,11 @@@ msgstr "%zu-битный хэш нед�
msgid "checking created signature failed: %s\n"
msgstr "сбой проверки созданной подписи: %s\n"
+#: agent/cvt-openpgp.c:338
msgid "secret key parts are not available\n"
- msgstr "закрытая часть ключа недоступна\n"
+ msgstr "секретная часть ключа недоступна\n"
+#: agent/cvt-openpgp.c:344
#, c-format
msgid "public key algorithm %d (%s) is not supported\n"
msgstr "алгоритм шифрования с открытым ключом %d (%s) не поддерживается\n"
@@@ -920,8 -708,6 +917,8 @@@ msgstr "ошибка при созда�
msgid "error creating a stream for a pipe: %s\n"
msgstr "ошибка при создании потока для канала конвейера: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "ошибка при дублировании процесса: %s\n"
@@@ -1069,7 -823,6 +1066,7 @@@ msgstr "агент gpg не работ�
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "ожидаю подключения агента ... (%iс)\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr "соединение с агентом установлено\n"
@@@ -1087,7 -837,6 +1084,7 @@@ msgstr "Dirmngr не выполняет
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "ожидаю подключения dirmngr ... (%iс)\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr "соединение с dirmngr установлено\n"
@@@ -1226,11 -943,9 +1223,11 @@@ msgstr "недопустимая хэш
msgid "Signature %d"
msgstr "Подпись %d"
+#: common/audit.c:1079
msgid "Certificate chain valid"
- msgstr "Цепочка сертификатов действительна"
+ msgstr "Цепочка сертификатов достоверна"
+#: common/audit.c:1090
msgid "Root certificate trustworthy"
msgstr "Корневой сертификат достоверен"
@@@ -1345,7 -1034,6 +1342,7 @@@ msgstr "параметр \"%.50s\" не
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда \"%.50s\" неоднозначна\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "нехватка выделенной памяти\n"
@@@ -1525,19 -1175,14 +1522,19 @@@ msgstr "сбой при трансля�
msgid "Enter passphrase: "
msgstr "Введите фразу-пароль:"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Карта OpenPGP недоступна: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Обнаружена карта OpenPGP номер %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "в пакетном режиме это действие невозможно\n"
@@@ -1549,154 -1192,115 +1546,154 @@@ msgstr "Эта команда дост�
msgid "Reset Code not or not anymore available\n"
msgstr "Код сброса (больше) не доступен\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ваш выбор? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[не установлено]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "мужской"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "женский"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "не указан"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "не принудительный"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "принудительный"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Ошибка: Допустим только простой текст ASCII.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Ошибка: Нельзя использовать символ \"<\".\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Ошибка: Двойные пробелы недопустимы.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Фамилия владельца карты: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Имя владельца карты: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Ошибка: Слишком длинное полное имя (предел - %d символов).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "URL для получения открытого ключа: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Ошибка: Слишком длинный URL (предел - %d символов).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "ошибка выделения достаточной памяти: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, c-format
msgid "error reading '%s': %s\n"
msgstr "ошибка чтения '%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "ошибка записи '%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Учетная запись (имя): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
"Ошибка: Слишком длинные данные учетной записи (предел - %d символов).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Секретные данные DO:"
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Ошибка: Слишком много секретных данных DO (предел - %d символов).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Предпочтительный язык: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Пол ((M) мужской, (F) женский или пробел): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Ошибка: недопустимый ответ.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "отпечаток удостоверяющего центра: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Ошибка: недопустимый формат отпечатка.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "операция с ключом невозможна: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "это не карта OpenPGP"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "ошибка при считывании информации ключа: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Заменить существующий ключ? (y/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1706,55 -1310,43 +1703,55 @@@ msgstr "
" Если создать ключ не удастся, сверьтесь с документацией\n"
" на карту и выясните, какие размеры допустимы.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Какой Вам нужен размер ключа для подписей? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Какой Вам нужен размер ключа для шифрования? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Какой Вам нужен размер ключа для аутентификации? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлен до %u бит\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "размер ключей %s должен быть в пределах %u-%u\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Теперь карта будет перенастроена на генерацию ключа длиной %u бит\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "ошибка изменения размера ключа %d до %u бит: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Сделать вне карты архивную копию ключа шифрования? (Y/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
msgid "Note: keys are already stored on the card!\n"
msgstr "Замечание: ключи уже хранятся на карте!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Заменить существующие ключи? (y/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1765,138 -1357,103 +1762,138 @@@ msgstr "
" PIN = '%s' Админ. PIN = '%s'\n"
"Вам следует изменить их командой --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Выберите тип создаваемого ключа:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Ключ подписи\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Ключ шифрования\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Ключ аутентификации\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Неправильный выбор.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Выберите, где хранить ключ:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "сбой записи ключа на карту: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
msgid "This command is not supported by this card\n"
msgstr "Данная команда этой картой не поддерживается.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Замечание: эта команда сотрет с карты все ключи!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
msgid "Continue? (y/N) "
msgstr "Продолжить? (y/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Подтвердите сброс к заводским установкам (введите \"yes\") "
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "выйти из этого меню"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "показать административные команды"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "показать данную справку"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "вывести все доступные данные"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "изменить имя владельца карты"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "изменить URL получения ключа"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "запросить ключ по заданному картой URL"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "изменить имя учетной записи"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "изменить языковые предпочтения"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "изменить пол владельца карты"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "сменить отпечаток удостоверяющего центра"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "переключить признак 'подпись требует PIN'"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "создать новые ключи"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "меню изменения или разблокировки PIN"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "проверить PIN и показать все данные"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "разблокировать PIN с помощью кода сброса"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr "уничтожить все ключи и данные"
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "Команды администрирования\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Команды администрирования разрешены\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Команды администрирования не разрешены\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Недопустимая команда (список команд: \"help\")\n"
@@@ -1904,72 -1460,59 +1901,79 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output для данной команды не работает\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, c-format
msgid "can't open '%s'\n"
msgstr "не могу открыть '%s'\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ \"%s\" не найден: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "ошибка чтения блока ключей: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "ключ \"%s\" не найден: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(если только Вы не задали ключ отпечатком)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "не могу выполнить в пакетном режиме без \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Удалить данный ключ из таблицы? (y/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
- msgstr "Это закрытый ключ! - все равно удалить? (y/N) "
+ msgstr "Это секретный ключ! - все равно удалить? (y/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, c-format
msgid "deleting secret %s failed: %s\n"
- msgstr "сбой при удалении закрытого %s: %s\n"
+ msgstr "сбой при удалении секретного %s: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "ключа"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "subkey"
msgstr "подключа"
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "сбой при удалении блока ключа: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "сведения о доверии владельцу сброшены\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "имеется закрытый ключ для открытого ключа \"%s\"!\n"
+ msgstr "имеется секретный ключ для открытого ключа \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "сначала удалите его командой \"--delete-secret-keys\".\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "ошибка при создании фразы-пароля: %s\n"
@@@ -2020,7 -1555,6 +2024,7 @@@ msgstr "
"принудительное использование симметричного шифра %s (%d) нарушает "
"предпочтения получателя\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "нельзя использовать %s в режиме %s\n"
@@@ -2104,263 -1622,217 +2108,284 @@@ msgstr "Внимание: не мог�
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "Внимание: не могу удалить временный каталог '%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "экспортировать подписи, помеченные как 'только локальные'"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "экспортировать атрибутные ID пользователя (обычно фотоидентификаторы)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "экспортировать ключи отзыва, помеченные как 'особо важные'"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "удалить при экспорте непригодные части ключа"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "при экспорте удалить из ключа как можно больше"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
- msgstr "экспорт закрытых ключей не разрешен\n"
+ msgstr "экспорт секретных ключей не разрешен\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ типа PGP 2.x - пропущен\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "ключ %s: материал ключа на карте - пропущен\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "Внимание: нечего экспортировать\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[ID пользователя не найден]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "автоматически получили '%s' через %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "ошибка получения '%s' через %s: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "Нет отпечатка"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "закрытый ключ \"%s\" не найден: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "не хватает аргумента для параметра \"%.50s\"\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NAME|использовать NAME как основной закрытый ключ"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
- "Параметр --allow-non-selfsigned-uid сделал недействительный ключ %s "
- "действительным\n"
+ "Параметр --allow-non-selfsigned-uid сделал недостоверный ключ %s "
+ "достоверным\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "использую подключ %s вместо первичного ключа %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "создать подпись"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "создать текстовую подпись"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "создать отделенную подпись"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "зашифровать данные"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "шифрование только симметричным шифром"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "проверить подпись"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "вывести список ключей"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "вывести список ключей и подписей"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "вывести и проверить подписи ключей"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
- msgstr "вывести список закрытых ключей"
+ msgstr "вывести список секретных ключей"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
msgid "quickly generate a new key pair"
msgstr "быстро создать новую пару ключей"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
msgid "quickly add a new user-id"
msgstr "быстро добавить новый ID пользователя"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr "создание полноценной пары ключей"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "создать сертификат отзыва"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
- msgstr "удалить ключи из таблицы закрытых ключей"
+ msgstr "удалить ключи из таблицы секретных ключей"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
msgid "quickly sign a key"
msgstr "быстро подписать ключ"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
msgid "quickly sign a key locally"
msgstr "быстро подписать ключ локально"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "подписать ключ"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "подписать ключ локально"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "сменить фразу-пароль"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "экспортировать ключи"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "экспортировать ключи на сервер ключей"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "импортировать ключи с сервера ключей"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "искать ключи на сервере ключей"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "обновить все ключи с сервера ключей"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "импортировать/объединить ключи"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "показать состояние карты"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "изменить данные на карте"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "сменить PIN карты"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "обновить таблицу доверия"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "вывести хэши сообщений"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "запуск в режиме сервера"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "вывод в текстовом формате"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифровать для пользователя USER-ID"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|установить уровень сжатия N (0 - без сжатия)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|FILE|выводить данные в файл FILE"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "не делать никаких изменений"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "спросить перед перезаписью"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "строго следовать стандарту OpenPGP"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2368,7 -1840,6 +2393,7 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. на странице man)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2388,11 -1859,9 +2413,11 @@@ msgstr "
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Вызов: @GPG@ [параметры] [файлы] (-h для подсказки)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2402,7 -1871,6 +2427,7 @@@ msgstr "
"Подписи и их проверка, шифрование и расшифровка\n"
"Действие по умолчанию зависит от входных данных\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2410,94 -1878,76 +2435,94 @@@ msgstr "
"\n"
"Поддерживаются следующие алгоритмы:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "С открытым ключом: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Симметричные шифры: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Хэш-функции: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "вызов: %s [параметры] %s\n"
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "в определении группы '%s' отсутствует знак =\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога,\n"
" содержащего модуль расширения '%s'\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему домашний каталог '%s'\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2505,480 -1955,431 +2530,552 @@@ msgstr "
"ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
" содержащему файл настроек '%s'\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему файл модуля расширения '%s'\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "неизвестный элемент в файле настроек '%s'\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "показать в списке ключей фотоидентификаторы"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
msgid "show key usage information during key listings"
msgstr "показать в списке ключей сведения о назначении ключа"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "показать в списке подписей URL правил"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "показать в списке подписей все примечания"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "показать в списке подписей примечания стандарта IETF"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "показать в списке подписей пользовательские примечания"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr "показать в списке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "показать в списке ключей действительность ID пользователей"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr "показать в списке ключей отозванные и просроченные ID пользователей"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "показать в списке ключей отозванные и просроченные подключи"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "показать в списке ключей название таблицы ключей"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "показать в списке подписей сроки действия"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "Доступные ключи:\n"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option '%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "неизвестный параметр '%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command '%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "неизвестная команда '%s'\n"
+
++#: g10/gpg.c:2085
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
- #: g10/gpg.c:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "параметр \"%.50s\" неоднозначен\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring '%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "ошибка создания таблицы ключей '%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "слишком старая версия libcrypt (нужно %s, есть %s)\n"
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Замечание: %s не предназначен для нормального применения!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' - не допустимый срок действия подписи\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "недопустимый режим ввода PIN '%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' - не допустимая таблица символов\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "не могу интерпретировать URL сервера ключей\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимые параметры списка\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "недопустимые параметры списка\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "показать при проверке подписи фотоидентификаторы"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "показать при проверке подписи URL правил"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "показать при проверке подписей все примечания"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "показать при проверке подписей примечания стандарта IETF"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "показать при проверке подписей пользовательские примечания"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "показать при проверке подписей действительность ID пользователей"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показать при проверке подписей отозванные и просроченные ID пользователя"
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr "показать при проверке подписей только первичный ID пользователя"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "проверить подписи по данным PKA"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "поднять доверие подписей по действительным данным PKA"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры проверки\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "недопустимые параметры проверки\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "Внимание: возможно создание файла образа памяти!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Внимание: %s отменяет %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s с %s недопустимо!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s с %s не имеет смысла!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "Внимание: работаем с фальшивым системным временем: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не будет работать с небезопасной памятью из-за %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм шифрования\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана недопустимая хэш-функция\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм сжатия\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "выбрана недопустимая хэш-функция для сертификации\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые личные предпочтения шифра\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "недопустимые личные предпочтения хэш-функции\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s!\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "шифрование '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3497
++#: g10/gpg.c:3868
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "хэш-функцию '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3502
++#: g10/gpg.c:3873
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "сжатие '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверия: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
- #: g10/gpg.c:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, fuzzy, c-format
+ #| msgid "line %d: invalid date given\n"
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "строка %d: задана недопустимая дата\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [файл]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [файл]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "сбой симметричного шифрования '%s': %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [файл]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [файл]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [файл]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [файл]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [файл]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [файл]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [файл]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [файл]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key <ID пользователя>"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key <ID пользователя>"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key <ID пользователя> [команды]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd <ID пользователя>"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "сбой при отправке на сервер ключей: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "сбой при получении с сервера ключей: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "сбой при экспорте ключа: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "сбой при поиске на сервере ключей: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "сбой при обновлении с сервера ключей: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из текстового формата: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в текстовый формат: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "недопустимая хэш-функция '%s'\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[файл]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Пишите сообщение ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL правил сертификации неверен\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL правил подписи неверен\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL предпочтительного сервера ключей неверен\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|FILE|взять ключи из файла таблицы ключей FILE"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "при несоответствии метки времени - только предупреждение"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|выводить информацию в файл с дескриптором FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Вызов: gpgv [параметры] [файлы] (-h для подсказки)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3083,22 -2463,18 +3180,22 @@@ msgstr " новых по
msgid " new key revocations: %lu\n"
msgstr " новых отзывов ключей: %lu\n"
+#: g10/import.c:456 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
- msgstr " прочитано закрытых ключей: %lu\n"
+ msgstr " прочитано секретных ключей: %lu\n"
+#: g10/import.c:458 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
- msgstr "импортировано закрытых ключей: %lu\n"
+ msgstr "импортировано секретных ключей: %lu\n"
+#: g10/import.c:460 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
- msgstr " неизмененных закрытых ключей: %lu\n"
+ msgstr " неизмененных секретных ключей: %lu\n"
+#: g10/import.c:462 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " не импортировано: %lu\n"
@@@ -3152,7 -2519,6 +3249,7 @@@ msgid "you can update your preferences
msgstr ""
"свои предпочтения можно обновить командой gpg --edit-key %s updpref save\n"
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: нет ID пользователя\n"
@@@ -3162,7 -2527,6 +3259,7 @@@
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr "исключен фильтром импорта"
@@@ -3185,7 -2545,6 +3282,7 @@@ msgstr "ключ %s: нет дейст�
msgid "this may be caused by a missing self-signature\n"
msgstr "может быть, из-за отсутствия самоподписи\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не найден открытый ключ: %s\n"
@@@ -3195,254 -2553,217 +3292,269 @@@
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новый ключ - пропущен\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "нет доступной для записи таблицы ключей: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "сохраняю в '%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "ошибка записи таблицы ключей '%s': %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не совпадает с нашей копией\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
- #: g10/import.c:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
- #: g10/import.c:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: \"%s\" 1 новый ID пользователя\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: \"%s\" %d новых ID пользователя\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: \"%s\" 1 новая подпись\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: \"%s\" %d новых подписей\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: \"%s\" 1 новый подключ\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: \"%s\" %d новых подключей\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: \"%s\" %d подпись очищена\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: \"%s\" %d подписей очищено\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: \"%s\" %d ID пользователя очищен\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: \"%s\" %d ID пользователя очищено\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: \"%s\" не изменен\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
- msgstr "ключ %s: импортирован закрытый ключ\n"
+ msgstr "ключ %s: импортирован секретный ключ\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, c-format
msgid "key %s: secret key already exists\n"
- msgstr "ключ %s: закрытый ключ уже имеется\n"
+ msgstr "ключ %s: секретный ключ уже имеется\n"
- #: g10/import.c:1562
++#: g10/import.c:1575
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: ошибка отправки в агент: %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, c-format
msgid "secret key %s: %s\n"
- msgstr "закрытый ключ %s: %s\n"
+ msgstr "секретный ключ %s: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
- msgstr "импорт закрытого ключа не допускается\n"
+ msgstr "импорт секретного ключа не допускается\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "ключ %s: закрытый ключ с недопустимым шифром %d - пропущен\n"
+ msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
- #: g10/import.c:1808
++#: g10/import.c:1844
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
- #: g10/import.c:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: нет ID пользователя для подписи\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: алгоритм с открытым ключом у ID пользователя \"%s\" не "
"поддерживается\n"
- #: g10/import.c:1979
++#: g10/import.c:2021
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: неправильная самоподпись на ID пользователя \"%s\"\n"
- #: g10/import.c:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: недействительная прямая подпись ключа\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: нет подключа для связывания ключей\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: недопустимая связь подключей\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: удалено многократное связывание подключей\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: нет подключа для отзыва ключа\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: неверный отзыв подключа\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: удален многократный отзыв подключей\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущен ID пользователя \"%s\"\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущен подключ\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: неэкспортируемая подпись (класс 0x%02X) - пропущена\n"
- #: g10/import.c:2198
++#: g10/import.c:2240
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
- #: g10/import.c:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - пропущен\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
- #: g10/import.c:2238
++#: g10/import.c:2280
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
- #: g10/import.c:2367
++#: g10/import.c:2409
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: обнаружено дублирование ID пользователя - объединены\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
- #: g10/import.c:2447
++#: g10/import.c:2489
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s отсутствует.\n"
- #: g10/import.c:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: добавлен сертификат отзыва \"%s\"\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: добавлена прямая подпись ключа\n"
@@@ -3467,61 -2784,53 +3579,67 @@@ msgstr "создан щит с ключ
msgid "keyring '%s' created\n"
msgstr "создана таблица ключей '%s'\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "источник блока ключей '%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening '%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "ошибка открытия '%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "сбой пересоставления буфера таблицы ключей: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[отзыв]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[самоподпись]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 плохая подпись\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d плохих подписей\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 подпись не проверена за отсутствием ключа\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d подписей не проверено за отсутствием ключей\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 подпись не проверена из-за ошибки\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d подписей не проверено из-за ошибок\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "обнаружен 1 ID пользователя без действительной самоподписи\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "обнаружено %d ID пользователя без действительной самоподписи\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3532,17 -2841,14 +3650,17 @@@ msgstr "
"достоверности ключей других пользователей (проверяет паспорт,\n"
"сверяет отпечатки ключей из разных источников и т.п.)\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Доверяю ограниченно\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Полностью доверяю\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3552,47 -2858,40 +3670,52 @@@ msgstr "
"позволяет ключу, который Вы подписываете, делать подписи доверия\n"
"от Вашего имени.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Введите домен, ограничивающий использование данной подписи, или пустую "
"строку, если нет ограничений.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID пользователя \"%s\" отозван."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Вы все равно хотите его подписать? (y/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Не могу подписать.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Срок действия ID пользователя \"%s\" истек."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID пользователя \"%s\" не самозаверен."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID пользователя \"%s\" можно подписать."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Подписать его? (y/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3601,11 -2900,9 +3724,11 @@@ msgstr "
"Самоподпись у \"%s\" -\n"
"это подпись типа PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Вы хотите преобразовать ее в самоподпись OpenPGP? (y/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3614,11 -2911,9 +3737,11 @@@ msgstr "
"Ваша текущая подпись на \"%s\"\n"
"просрочена.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3627,44 -2922,35 +3750,44 @@@ msgstr "
"Ваша текущая подпись на \"%s\"\n"
"является локальной.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Вы хотите преобразовать ее в полную экспортируемую подпись? (y/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" уже локально подписан ключом %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" уже подписан ключом %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Вы все равно хотите снова подписать его? (y/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Нечего подписывать ключом %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Данный ключ просрочен!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Срок действия данного ключа истекает %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Вы хотите, чтобы Ваша подпись была действительна до того же времени? (Y/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3673,31 -2959,25 +3796,31 @@@ msgstr "
"Насколько хорошо Вы проверили, что ключ действительно принадлежит\n"
"указанному выше человеку? Если не знаете, что ответить, введите \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Не буду отвечать.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Никакой проверки не было.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Была частичная проверка.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Проверка была очень тщательной.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
msgid "Your selection? (enter '?' for more information): "
msgstr "Ваш выбор? (введите '?' для получения информации): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3706,226 -2986,171 +3829,226 @@@ msgstr "
"Вы уверены, что хотите подписать этот ключ\n"
"своим ключом \"%s\" (%s)?\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Это будет самоподпись.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "Внимание: подпись не будет помечена как неэкспортируемая.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "Внимание: подпись не будет помечена как неотзываемая.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "Подпись будет помечена как неэкспортируемая.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "Подпись будет помечена как неотзываемая.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Этот ключ мной никак не проверялся.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "Мной проведена поверхностная проверка этого ключа.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "Этот ключ проверен мной очень тщательно.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Действительно подписать? (y/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "подписать не удалось: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"В ключе только заготовка или элементы для карты -\n"
"фразы-пароля для изменения нет.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "ключ %s: ошибка изменения фразы-пароля: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "перемещение подписи ключа в нужное место\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "сохранить и выйти"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "показать отпечаток ключа"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
msgid "show the keygrip"
msgstr "показать код ключа"
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "вывести список ключей и ID пользователя"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "выбрать ID пользователя N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "выбрать подключ N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "проверка подписей"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr "подписать выбранные ID пользователя [* описание команд см. ниже]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "локально подписать выбранные ID пользователя"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "подписать выбранные ID пользователя подписью доверия"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "подписать выбранные ID пользователя без возможности отзыва"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "добавить ID пользователя"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "добавить фотоидентификатор"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "удалить выбранные ID пользователя"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "добавить подключ"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "добавить ключ на криптографическую карту"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "переместить ключ на криптографическую карту"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "переместить архивный ключ на криптографическую карту"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "удалить выбранные подключи"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "добавить ключ отзыва"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "удалить подписи с выбранных ID пользователя"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "сменить срок действия ключа или выбранных подключей"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "пометить выбранный ID пользователя как первичный"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "список предпочтений (экспертам)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "список предпочтений (подробный)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "установить список предпочтений для выбранных ID пользователя"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"установить URL предпочтительного сервера ключей для выбранных ID пользователя"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "установить примечание для выбранных ID пользователя"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "сменить фразу-пароль"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "изменить уровень доверия владельцу"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "отозвать подписи у выбранных ID пользователя"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "отозвать выбранные ID пользователя"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "отозвать ключ или выбранные подключи"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "подключить ключ"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "отключить ключ"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "показать выбранные фотоидентификаторы"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"сжать непригодные ID пользователей и удалить непригодные подписи из ключа"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "сжать непригодные ID пользователей и удалить все подписи из ключа"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
- msgstr "Закрытый ключ доступен.\n"
+ msgstr "Секретный ключ доступен.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
- msgstr "Для данного действия нужен закрытый ключ.\n"
+ msgstr "Для данного действия нужен секретный ключ.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -3936,220 -3161,170 +4059,221 @@@ msgstr "
" 't' (подписи доверия, tsign), 'nr' (неотзываемые, \n"
" nrsign) или любое их сочетание (ltsign, tnrsign и т.д.).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Ключ отозван."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Действительно подписать все ID пользователя? (y/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Действительно подписать все ID пользователя? (y/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Подсказка: Выберите ID пользователей, которые нужно подписать\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Неизвестный тип подписи '%s'\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Данная команда в режиме %s недопустима.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Вы должны выбрать хотя бы один ID пользователя.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
- msgstr ""
+ msgstr "(Команда '%s'.)\n"
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Вы не можете удалить последний ID пользователя!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Действительно удалить все выбранные ID пользователей? (y/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Действительно удалить этот ID пользователя? (y/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Действительно переместить первичный ключ? (y/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "Команде нужен аргумент-имя файла\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Не могу открыть '%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Ошибка чтения архивного ключа из '%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Вы действительно хотите удалить выбранные ключи? (y/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Вы действительно хотите удалить данный ключ? (y/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Действительно отозвать все выбранные ID пользователей? (y/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Действительно отозвать данный ID пользователя? (y/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Вы действительно хотите отозвать ключ целиком? (y/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Вы действительно хотите отозвать данный подключ? (y/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Нельзя присваивать степень доверия, когда таблица доверия указана "
"пользователем\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Установить предпочтения в:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Действительно обновить предпочтения для выбранных ID пользователей? (y/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Действительно обновить предпочтения? (y/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Сохранить изменения? (y/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Выйти без сохранения? (y/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "сбой при обновлении: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не изменялся - обновление не нужно.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "закрытый ключ \"%s\" не найден: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" - не отпечаток\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" - не первичный отпечаток\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "No matching user IDs."
msgstr "Нет подходящих ID пользователей."
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "Nothing to sign.\n"
msgstr "Подписывать нечего.\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Хэш: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Характеристики: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Не изменять на сервере"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Предпочтительный сервер ключей: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Примечания: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "В ID пользователя типа PGP 2.x не может быть предпочтений.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(особо важный)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr " создан: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr " отозван: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "просрочен с: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr " годен до: %s"
@@@ -4157,30 -3332,24 +4281,30 @@@
# perhaps this should be somewhere in help/man
# (S - подпись, C - сертификация, E - шифрование, A - аутентификация)
# too long for repeating messages.
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "назначение: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "номер карты: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "доверие: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "достоверность: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Данный ключ отключен"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4188,18 -3357,13 +4312,18 @@@ msgstr "
"Учтите, что показанная достоверность ключа может быть неверной,\n"
"пока Вы не перезапустите программу.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "отозван"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "просрочен"
# check it
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4208,15 -3372,12 +4332,15 @@@ msgstr "
" привести к тому, что первичным станет считаться другой\n"
" ID пользователя.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
msgid "You may want to change its expiration date too.\n"
msgstr "Возможно, надо поменять также срок действия.\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4225,78 -3386,61 +4349,78 @@@ msgstr "
"Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
" в некоторых версиях PGP вызвать отбраковку ключа.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Вы уверены, что хотите добавить это? (y/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "Такой ID пользователя на этом ключе уже есть!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Удалить данную действительную подпись? (y/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Удалить данную недействительную подпись? (y/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Удалить данную неизвестную подпись? (y/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Действительно удалить данную самоподпись? (y/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Удалена %d подпись.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Удалено %d подписей.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Ничего не удалено.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "недопустимый"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID пользователя \"%s\" сжат: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "ID пользователя \"%s\": %d подпись удалена\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "ID пользователя \"%s\": %d подписей удалено\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID пользователя \"%s\" уже минимизирован\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID пользователя \"%s\": уже очищен\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4305,183 -3449,152 +4429,194 @@@ msgstr "
"Внимание: Это ключ типа PGP 2.x. Добавление особого отзывающего ключа\n"
" может в некоторых версиях PGP вызвать выбраковку ключа.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Нельзя добавить особый отзывающий ключ в ключ типа PGP 2.x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Укажите ID пользователя ключа, назначенного отзывающим: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "нельзя назначить отзывающим ключ типа PGP 2.x\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "ключ не может быть назначен отзывающим самого себя\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "этот ключ уже назначен отзывающим\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Выделите не более одного подключа.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Смена срока действия подключа.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Смена срока действия первичного ключа.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Нельзя изменить срок действия ключа v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "подписывающий подключ %s уже перекрестно заверен\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "подключ %s не для подписей, он не нуждается в перекрестном заверении\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Выберите ровно один ID пользователя.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропуск самоподписи v3 на ID пользователя \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Введите URL предпочтительного сервера ключей: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Вы действительно хотите заменить его? (y/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Вы действительно хотите удалить его? (y/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Введите примечание: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "Продолжить? (y/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Нет ID пользователя с индексом %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Нет ID пользователя с хэшем %s\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Нет подключа с индексом %d\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "Нет подключа с индексом %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID пользователя: \"%s\"\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "подписано Вашим ключом %s %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (неэкспортируемая)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Срок действия подписи истек %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Вы уверены, что хотите отозвать? (y/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "Вами не подписано.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Вы подписали эти ID пользователей на ключе %s:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (неотзываемая)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "отозвано Вашим ключом %s %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Вы отзываете следующие подписи:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Действительно создать сертификат отзыва? (y/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
- msgstr "нет закрытого ключа\n"
+ msgstr "нет секретного ключа\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID пользователя \"%s\" уже отозван\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "Внимание: подпись ID пользователя датирована %d секундами в будущем\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Ключ %s уже отозван.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Подключ %s уже отозван.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ фотоидентификатора %s размера %ld для ключа %s (uid %d)\n"
@@@ -4520,14 -3625,10 +4655,14 @@@ msgstr "запись самоподпи
msgid "writing key binding signature\n"
msgstr "запись объединяющей подписи\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "неверный размер ключа; использую %u бит\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "размер ключа округлен вверх до %u бит\n"
@@@ -4817,40 -3869,35 +4952,45 @@@ msgstr "
msgid "Real name: "
msgstr "Ваше полное имя: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Недопустимый символ в имени\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Имя не должно начинаться с цифры\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Имя не должно быть короче 5 символов\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Адрес электронной почты: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Неправильный адрес электронной почты\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Комментарий: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Недопустимый символ в комментарии\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Используется таблица символов: '%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4861,7 -3908,6 +5001,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Не вставляйте адрес электронной почты в имя пользователя или комментарий\n"
@@@ -4877,55 -3923,44 +5017,55 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Сменить (N)Имя, (C)Комментарий, (E)Адрес или (Q)Выход? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Сменить (N)Имя, (C)Комментарий, (E)Адрес или (O)Принять/(Q)Выход? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Сменить (N)Имя, (E)Адрес или (Q)Выход? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Сменить (N)Имя, (E)Адрес или (O)Принять/(Q)Выход? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Сначала исправьте ошибку\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
- "Для защиты закрытого ключа необходима фраза-пароль.\n"
+ "Для защиты секретного ключа необходима фраза-пароль.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr ""
"Введите фразу-пароль для защиты архивной копии нового ключа для шифрования."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "фраза-пароль повторена неверно; попробуйте еще раз"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -4937,7 -3972,6 +5077,7 @@@ msgstr "
"запустив данную программу с параметром \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -4950,12 -3984,10 +5090,12 @@@ msgstr "
"случайных чисел больше возможностей получить достаточное количество "
"энтропии.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -4966,53 -3998,42 +5106,53 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr "Продолжить? (Y/n) "
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ключ для \"%s\" уже существует\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
msgid "Create anyway? (y/N) "
msgstr "Все равно создать новый? (y/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
msgid "creating anyway\n"
msgstr "принудительное создание\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Замечание: \"%s %s\" вызывает полнофункциональный диалог создания ключа.\n"
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Создание ключа прервано.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, c-format
msgid "writing public key to '%s'\n"
msgstr "сохранение открытого ключа в '%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей '%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
- msgstr "открытый и закрытый ключи созданы и подписаны.\n"
+ msgstr "открытый и секретный ключи созданы и подписаны.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5020,7 -4041,6 +5160,7 @@@ msgstr "
"Учтите, что данный ключ не может использоваться для шифрования. Вы можете\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5028,7 -4048,6 +5168,7 @@@ msgstr "
"ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5036,235 -4055,183 +5176,235 @@@ msgstr "
"ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
- msgstr "Закрытые части первичного ключа отсутствуют.\n"
+ msgstr "Секретные части первичного ключа отсутствуют.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "Закрытые части первичного ключа хранятся на карте.\n"
+ msgstr "Секретные части первичного ключа хранятся на карте.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Действительно создать? (y/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "сбой сохранения ключа на карте: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "не могу создать архивную копию, файл '%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Замечание: архивная копия ключа с карты сохранена в '%s'\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "никогда "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Критические правила подписи: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Правила подписи: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Критический предпочтительный сервер ключей: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Критическое примечание к подписи: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Примечание к подписи: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
msgid "1 good signature\n"
msgstr "1 хорошая подпись\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, c-format
msgid "%d good signatures\n"
msgstr "%d хороших подписей\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr "Внимание: %lu ключей пропущено из-за большого размера\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Таблица ключей"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "пропущено \"%s\": %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Отпечаток главного ключа:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Отпечаток главного ключа:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Отпечаток ключа ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " серийный номер карты ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "сбой при переименовании '%s' в '%s': %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, c-format
msgid "caching keyring '%s'\n"
msgstr "занесение таблицы ключей '%s' в буфер\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "пока в буфер помещено %lu ключей (%lu подписей)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu ключей помещено в буфер (%lu подписей)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: таблица ключей создана\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr "переназначить настройки промежуточного сервера для dirmngr"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "включить в результаты поиска отозванные ключи"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "искать по ID ключа, включая подключи"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr "переназначить настройки времени ожидания для dirmngr"
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "автоматически получать ключи при проверке подписей"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "учитывать набор URL предпочтительных серверов ключей для этого ключа"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "учитывать набор записей PKA при получении ключей"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "отключен"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Введите числа, N) Следующее или Q) Выход> "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "недопустимый протокол сервера ключей (ожидается %d, получено %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" не идентификатор ключа: пропущен\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "обновление 1 ключа из %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "Внимание: невозможно обновить ключ %s с %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "обновление %d ключей из %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "ключ \"%s\" не найден на сервере ключей\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "ключ не найден на сервере ключей\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "не заданы серверы ключей (используйте --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "запрашиваю ключ %s с сервера %s %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "получение ключа %s с %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "отправка ключа %s на сервер %s %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "отправка ключа %s на %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, c-format
msgid "requesting key from '%s'\n"
msgstr "запрос ключа из '%s'\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Внимание: невозможно получить URI %s: %s\n"
@@@ -5298,7 -4259,6 +5438,7 @@@ msgstr "данные зашифрова
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "зашифровано %u-битным ключом %s с ID %s, созданным %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
@@@ -5344,252 -4295,201 +5484,253 @@@ msgstr "расшифровано нор
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Внимание: зашифрованное сообщение было изменено!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "в буфере сброшена фраза-пароль с индексом %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "сбой расшифровки: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "Замечание: отправитель запросил \"только между нами\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "первоначальное имя файла='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "Внимание: наблюдается несколько текстов\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "отдельный сертификат отзыва: задействуется командой \"gpg --import\"\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "подпись не найдена\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПЛОХАЯ подпись пользователя \"%s\""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Просроченная подпись пользователя \"%s\""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "Действительная подпись пользователя \"%s\""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "проверка подписи подавлена\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "не могу обработать эти неоднозначные данные подписи\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Подпись сделана %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " ключом %s с ID %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Подпись сделана %s ключом %s с ID %s\n"
- #: g10/mainproc.c:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Ключ доступен на: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[сомнительно]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " или \"%s\""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Подпись просрочена %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Подпись действительна до %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "формат подписи: %s, хэш-функция %s%s%s\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "двоичный"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "текстовый"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "неизвестно"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "Внимание: не отделенная подпись; файл '%s' НЕ был проверен!\n"
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не могу проверить подпись: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "не отделенная подпись\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"Внимание: обнаружено несколько подписей. Проверена будет только первая.\n"
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "отдельная подпись класса 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "подпись старого типа (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "сбой fstat '%s' в функции %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "сбой fstat(%d) в функции %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr ""
"Внимание: используется экспериментальный алгоритм шифрования с открытым "
"ключом %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "Внимание: Ключи для подписи+шифрования Elgamal не рекомендуются\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr ""
"Внимание: используется экспериментальный алгоритм симметричного шифрования "
"%s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "Внимание: используется экспериментальная хэш-функция %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "Внимание: хэш-функция %s не рекомендуется\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Замечание: подписи с хэш-функцией %s игнорируются\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: параметр \"%s\" не рекомендуется\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "Внимание: параметр \"%s\" не рекомендуется\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "используйте вместо этого \"%s%s\"\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
"Внимание: команда \"%s\" не рекомендуется к употреблению - не применяйте ее\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: \"%s\" в этом файле устарело - оно действует только в %s\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "Внимание: параметр \"%s%s\" устарел - он действует только для %s\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Без сжатия"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "без сжатия|без|none"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "данное сообщение может быть непригодно для %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "неоднозначный параметр '%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, c-format
msgid "unknown option '%s'\n"
msgstr "неизвестный параметр '%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "Открытый ключ ECDSA бывает в кодировке SEC, кратной 8 битам\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type '%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Неизвестный тип подписи '%s'\n"
+
+#: g10/openfile.c:85
#, c-format
msgid "File '%s' exists. "
msgstr "Файл '%s' существует. "
@@@ -5680,9 -4564,8 +5821,9 @@@ msgid "
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr ""
- "Необходима фраза-пароль для доступа к закрытому ключу пользователя: \"%s\"\n"
+ "Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
+#: g10/passphrase.c:492
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-битный ключ %s, ID %s, создан %s"
@@@ -5692,31 -4574,24 +5833,31 @@@
msgid " (subkey on main key ID %s)"
msgstr " (подключ на главном ключе %s)"
+#: g10/passphrase.c:666
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
- msgstr "Введите фразу-пароль для разблокировки закрытого ключа OpenPGP:"
+ msgstr "Введите фразу-пароль для разблокировки секретного ключа OpenPGP:"
+#: g10/passphrase.c:670
msgid "Please enter the passphrase to import the OpenPGP secret key:"
- msgstr "Введите фразу-пароль для импорта закрытого ключа OpenPGP:"
+ msgstr "Введите фразу-пароль для импорта секретного ключа OpenPGP:"
+#: g10/passphrase.c:675
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
- msgstr "Введите фразу-пароль для экспорта закрытого подключа OpenPGP:"
+ msgstr "Введите фразу-пароль для экспорта секретного подключа OpenPGP:"
+#: g10/passphrase.c:678
msgid "Please enter the passphrase to export the OpenPGP secret key:"
- msgstr "Введите фразу-пароль для экспорта закрытого ключа OpenPGP:"
+ msgstr "Введите фразу-пароль для экспорта секретного ключа OpenPGP:"
+#: g10/passphrase.c:683
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "Вы действительно хотите навсегда удалить закрытый подключ OpenPGP:"
+ msgstr "Вы действительно хотите навсегда удалить секретный подключ OpenPGP:"
+#: g10/passphrase.c:686
msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "Вы действительно хотите навсегда удалить закрытый ключ OpenPGP:"
+ msgstr "Вы действительно хотите навсегда удалить секретный ключ OpenPGP:"
+#: g10/passphrase.c:695
#, c-format
msgid ""
"%s\n"
@@@ -5776,31 -4643,24 +5917,31 @@@ msgstr "Это правильная ф�
msgid "unable to display photo ID!\n"
msgstr "не могу отобразить фотоидентификатор!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Причина не указана"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Ключ заменен другим"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Ключ был раскрыт"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Ключ больше не используется"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "ID пользователя больше не действителен"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "причина отзыва: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "пояснение к отзыву: "
@@@ -5814,53 -4674,42 +5955,53 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Не задано значение доверия для:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " или \"%s\"\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"Насколько Вы уверены, что данный ключ принадлежит названному пользователю?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Не знаю или не буду отвечать\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = НЕ доверяю\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Абсолютно доверяю\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = вернуться в главное меню\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = пропустить этот ключ\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " q = выход\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -5869,41 -4718,33 +6010,41 @@@ msgstr "
"Минимальный уровень доверия данному ключу: %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Ваше решение? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Вы действительно хотите сделать этот ключ абсолютно доверенным? (y/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Сертификаты, ведущие к абсолютно доверенному ключу:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: Нет свидетельств того, что данный ключ принадлежит названному "
"пользователю\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: Мало свидетельств того, что данный ключ принадлежит названному "
"пользователю\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Этот ключ, вероятно, принадлежит названному владельцу\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Данный ключ принадлежит нам\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -5913,111 -4754,86 +6054,111 @@@ msgstr "
"в ID пользователя. Если Вы ТОЧНО знаете, что делаете,\n"
"можете ответить на следующий вопрос утвердительно.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "Все равно использовать данный ключ? (y/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "Внимание: Использование недоверенного ключа!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "Внимание: возможно, данный ключ отозван (ключ отзыва отсутствует)\n"
- #: g10/pkclist.c:546
++#: g10/pkclist.c:547
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "Внимание: Данный ключ отозван ключом, назначенным отзывающим!\n"
- #: g10/pkclist.c:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "Внимание: Данный ключ отозван его владельцем!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " Это может означать, что подпись подделана.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "Внимание: Данный подключ был отозван его владельцем!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Замечание: Данный ключ отключен.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Замечание: Проверенный адрес подписавшего - '%s'\n"
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Замечание: Адрес подписавшего '%s' не соответствует данным DNS\n"
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "уровень доверия установлен в ПОЛНОСТЬЮ по действительным данным PKA\n"
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "уровень доверия установлен в НИКОГДА из-за непригодных данных PKA\n"
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Замечание: Данный ключ просрочен!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "Внимание: Данный ключ не заверен доверенной подписью!\n"
- #: g10/pkclist.c:632
++#: g10/pkclist.c:633
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Нет указаний на то, что подпись принадлежит владельцу.\n"
- #: g10/pkclist.c:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "Внимание: НЕТ ДОВЕРИЯ данному ключу!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Возможно, что подпись ПОДДЕЛАНА.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"Внимание: Этот ключ не заверен достаточным количеством доверенных подписей!\n"
- #: g10/pkclist.c:651
++#: g10/pkclist.c:652
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Нет уверенности в том, что подпись принадлежит владельцу.\n"
- #: g10/pkclist.c:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: открытый ключ отключен\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: открытый ключ уже существует\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Не задан ID пользователя (можно использовать \"-r\").\n"
- #: g10/pkclist.c:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Текущие получатели:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6025,83 -4841,64 +6166,83 @@@ msgstr "
"\n"
"Введите ID пользователя. Завершите пустой строкой: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Нет такого ID пользователя.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Открытый ключ отключен.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "пропущено: открытый ключ уже установлен\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "неизвестный получатель по умолчанию \"%s\"\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "нет пригодных адресов\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Замечание: у ключа %s нет функции %s\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Замечание: у ключа %s нет предпочтения для %s\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, c-format
msgid "error creating '%s': %s\n"
msgstr "ошибка создания '%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Отделенная подпись.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Введите имя файла с данными: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "читаю stdin ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "нет подписанных данных\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "не могу открыть подписанные данные '%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "не могу открыть подписанные данные fd=%d: %s\n"
+#: g10/pubkey-enc.c:117
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "анонимный получатель; пробую закрытый ключ %s ...\n"
+ msgstr "анонимный получатель; пробую секретный ключ %s ...\n"
+#: g10/pubkey-enc.c:124
msgid "okay, we are the anonymous recipient.\n"
msgstr "отлично, мы - анонимный получатель.\n"
@@@ -6120,17 -4914,13 +6261,17 @@@ msgid "WARNING: cipher algorithm %s no
msgstr ""
"Внимание: в списке предпочтений получателя алгоритм шифрования %s не найден\n"
+#: g10/pubkey-enc.c:378
#, c-format
msgid "Note: secret key %s expired at %s\n"
- msgstr "Замечание: закрытый ключ %s просрочен с %s\n"
+ msgstr "Замечание: секретный ключ %s просрочен с %s\n"
+#: g10/pubkey-enc.c:385
msgid "Note: key has been revoked"
msgstr "Замечание: ключ был отозван"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "сбой build_packet: %s\n"
@@@ -6140,41 -4929,37 +6281,47 @@@
msgid "key %s has no user IDs\n"
msgstr "у ключа %s нет ID пользователя\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Будет отозван:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Это особо важный ключ отзыва)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Закрытый ключ доступен.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Создать сертификат отзыва данного ключа? (y/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "Для вывода использован текстовый формат ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "сбой make_keysig_packet: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Сертификат отзыва создан.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "ключи отзыва для \"%s\" не найдены\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Это сертификат отзыва ключа OpenPGP:"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6182,10 -4967,9 +6329,10 @@@
"a reason for the revocation."
msgstr ""
"Пользуйтесь им для отзыва этого ключа в случае раскрытия или потери\n"
- "закрытого ключа. Однако, если закрытый ключ доступен, лучше создать\n"
+ "секретного ключа. Однако, если секретный ключ доступен, лучше создать\n"
"новый сертификат с указанием причины отзыва."
- #: g10/revoke.c:564
++#: g10/revoke.c:572
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"
@@@ -6195,11 -4979,21 +6342,25 @@@ msgstr "
"вставлено двоеточие. Удалите это двоеточие в текстовом редакторе\n"
"перед использованием этого сертификата отзыва."
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "закрытый ключ \"%s\" не найден: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Создать сертификат отзыва данного ключа? (y/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6218,33 -5012,26 +6379,33 @@@ msgstr "
"носитель будет поврежден, но будьте осторожны: система печати\n"
"Вашей машины может сохранить данные и сделать их доступными для других!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Укажите причину отзыва:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Отмена"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Скорее всего, Вы здесь выберете %d)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Введите необязательное пояснение; завершите пустой строкой:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Причина отзыва: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Пояснения отсутствуют)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Все правильно? (y/N) "
@@@ -6268,36 -5051,29 +6429,36 @@@ msgstr "ключ %s %s использу
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "Ключ %s %s требует %zu-битного или более длинного хэша (хэш %s)\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "Внимание: конфликт хэшей подписей в сообщении\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "Внимание: подписывающий подключ %s не был перекрестно заверен\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "за подробностями обращайтесь к %s\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "Внимание: подписывающий подключ %s неправильно перекрестно заверен\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "открытый ключ %s на %lu секунду новее подписи\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "открытый ключ %s на %lu секунд новее подписи\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6305,7 -5081,6 +6466,7 @@@ msgstr "
"ключ %s создан на %lu секунду в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6313,28 -5088,23 +6474,28 @@@ msgstr "
"ключ %s создан на %lu секунд в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Замечание: срок действия подписавшего ключа %s истек %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Замечание: ключ для подписей %s отозван\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"подпись ключа %s считается плохой из-за неизвестного критического бита\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "ключ %s: нет подключа для отзывающей подписи подключа\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "ключ %s: нет подключа для подписи связи подключей\n"
@@@ -6380,32 -5144,26 +6541,32 @@@ msgstr "
msgid "signing:"
msgstr "подпись:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "будет использовано шифрование по %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"ключ не помечен как небезопасный - не могу использовать его с фальшивым "
"генератором случайных чисел!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "пропущено \"%s\": дубликат\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
- msgstr "пропущено: закрытый ключ уже имеется\n"
+ msgstr "пропущено: секретный ключ уже имеется\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"это ключ Elgamal, созданный PGP, он не обеспечивает безопасность подписи!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
@@@ -6450,7 -5200,6 +6611,7 @@@ msgstr "ошибка при поиск�
msgid "read error in '%s': %s\n"
msgstr "ошибка чтения в '%s': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "таблица доверия: сбой синхронизации: %s\n"
@@@ -6479,7 -5223,6 +6640,7 @@@ msgstr "таблица доверия,
msgid "trustdb transaction too large\n"
msgstr "слишком большая операция над таблицей доверия\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "нет доступа к '%s': %s\n"
@@@ -6593,146 -5313,115 +6754,144 @@@ msgstr "не могу обработа�
msgid "input line longer than %d characters\n"
msgstr "строка ввода длиннее %d символов\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s' не является допустимым длинным ID ключа\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "ключ %s: принят как доверенный ключ\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "ключ %s встречается в таблице доверия более одного раза\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "ключ %s: нет открытого ключа для доверенного ключа - пропущен\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "ключ %s помечен как абсолютно доверенный\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "тип записи о доверии %lu отличается от запрошенного (%d)\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "Можно попытаться пересоздать таблицу доверия командами:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "Если это не выйдет, обратитесь к руководству пользователя\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"не могу использовать неизвестную модель (%d) - использую модель доверия %s\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "использую модель доверия %s\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "проверка таблицы доверия не нужна\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "срок следующей проверки таблицы доверия %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "проверять таблицу доверия при модели доверия '%s' не нужно\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "обновлять таблицу доверия при модели доверия '%s' не нужно\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "открытый ключ %s не найден: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "выполните --check-trustdb, пожалуйста\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "проверка таблицы доверия\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "обработано %d ключей (сброшено %d счетчиков достоверности)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "абсолютно доверенных ключей не найдено\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "открытый ключ для абсолютно доверенного ключа %s не найден\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "требуется %d с ограниченным доверием, %d с полным, модель доверия %s\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- "глубина: %d верных: %3d подписанных: %3d доверие: %d-, %dq, %dn, %dm, "
- "%df, %du\n"
+ "глубина: %d достоверных: %3d подписанных: %3d доверие: %d-, %dq, %dn, "
+ "%dm, %df, %du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"невозможно обновить запись о версии таблицы доверия: ошибка записи: %s\n"
+#: g10/trust.c:106
msgid "undefined"
- msgstr ""
+ msgstr "неопределено"
+#: g10/trust.c:107
- #, fuzzy
- #| msgid "never "
msgid "never"
- msgstr "никогда "
+ msgstr "никогда"
+#: g10/trust.c:108
msgid "marginal"
- msgstr ""
+ msgstr "ограничено"
+#: g10/trust.c:109
msgid "full"
- msgstr ""
+ msgstr "полное"
+#: g10/trust.c:110
msgid "ultimate"
- msgstr ""
+ msgstr "абсолютное"
#. TRANSLATORS: these strings are similar to those in
#. trust_value_to_string(), but are a fixed length. This is needed to
@@@ -6742,45 -5431,30 +6901,39 @@@
#. 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:147
msgid "10 translator see trust.c:uid_trust_string_fixed"
- msgstr ""
+ msgstr "12 translator see trust.c:uid_trust_string_fixed"
+#: g10/trust.c:150
- #, fuzzy
- #| msgid "revoked"
msgid "[ revoked]"
- msgstr "отозван"
+ msgstr "[ отозван ]"
+#: g10/trust.c:152 g10/trust.c:158
- #, fuzzy
- #| msgid "expired"
msgid "[ expired]"
- msgstr "просрочен"
+ msgstr "[ просрочен ]"
+#: g10/trust.c:157
- #, fuzzy
- #| msgid "unknown"
msgid "[ unknown]"
- msgstr "неизвестно"
+ msgstr "[ неизвестно ]"
+#: g10/trust.c:159
msgid "[ undef ]"
- msgstr ""
+ msgstr "[неопределено]"
+#: g10/trust.c:160
msgid "[marginal]"
- msgstr ""
+ msgstr "[ ограничено ]"
+#: g10/trust.c:161
msgid "[ full ]"
- msgstr ""
+ msgstr "[ полное ]"
+#: g10/trust.c:162
msgid "[ultimate]"
- msgstr ""
+ msgstr "[ абсолютно ]"
+#: g10/verify.c:118
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -6949,11 -5588,9 +7102,11 @@@ msgstr "PIN для CHV%d слишко�
msgid "verify CHV%d failed: %s\n"
msgstr "сбой при проверке CHV%d: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "ошибка получения статуса CHV с карты\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "карта окончательно заблокирована!\n"
@@@ -7083,13 -5692,11 +7236,13 @@@ msgstr "карта не поддерж�
msgid "signatures created so far: %lu\n"
msgstr "создано подписей: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"проверка административного PIN в данный момент запрещена этой командой\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "нет доступа к %s - непригодная карта OpenPGP?\n"
@@@ -7109,7 -5713,6 +7262,7 @@@ msgstr "|N|Первоначальны�
msgid "run in multi server mode (foreground)"
msgstr "работать в многосерверном режиме (нефоновый режим)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
@@@ -7166,12 -5757,10 +7319,12 @@@ msgid "please use the option '--daemon
msgstr ""
"используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "обработчик fd %d запущен\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "обработчик fd %d остановлен\n"
@@@ -7270,24 -5836,19 +7423,24 @@@ msgstr "проверьте, что \"di
msgid "checking the CRL failed: %s"
msgstr "сбой проверки списка отозванных сертификатов: %s"
+#: sm/certchain.c:1036 sm/certchain.c:1104 dirmngr/validate.c:473
#, c-format
msgid "certificate with invalid validity: %s"
- msgstr "сертификат с недействительной действительностью: %s"
+ msgstr "сертификат с недействительной достоверностью: %s"
+#: sm/certchain.c:1051 sm/certchain.c:1136 dirmngr/validate.c:491
msgid "certificate not yet valid"
- msgstr "сертификат еще не действителен"
+ msgstr "сертификат еще не достоверен"
+#: sm/certchain.c:1052 sm/certchain.c:1137
msgid "root certificate not yet valid"
- msgstr "корневой сертификат еще не действителен"
+ msgstr "корневой сертификат еще не достоверен"
+#: sm/certchain.c:1053 sm/certchain.c:1138
msgid "intermediate certificate not yet valid"
- msgstr "промежуточный сертификат еще не действителен"
+ msgstr "промежуточный сертификат еще не достоверен"
+#: sm/certchain.c:1066 dirmngr/validate.c:502
msgid "certificate has expired"
msgstr "сертификат просрочен"
@@@ -7304,11 -5862,9 +7457,11 @@@ msgstr "промежуточный се
msgid "required certificate attributes missing: %s%s%s"
msgstr "сертификат не имеет требуемых атрибутов: %s%s%s"
+#: sm/certchain.c:1119
msgid "certificate with invalid validity"
- msgstr "сертификат с недействительной действительностью"
+ msgstr "сертификат с недействительной достоверностью"
+#: sm/certchain.c:1156
msgid "signature not created during lifetime of certificate"
msgstr "подпись создана вне времени действия сертификата"
@@@ -7586,7 -6083,6 +7739,7 @@@ msgstr "строка %d: ошибка �
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "строка %d: сбой создания ключа: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -7808,11 -6256,9 +7961,11 @@@ msgstr "предполагаю, что
msgid "never consult a CRL"
msgstr "не сверять со списком отозванных сертификатов"
+#: sm/gpgsm.c:269
msgid "check validity using OCSP"
- msgstr "проверка действительности с помощью OCSP"
+ msgstr "проверка достоверности с помощью OCSP"
+#: sm/gpgsm.c:274
msgid "|N|number of certificates to include"
msgstr "|N|число включаемых сертификатов"
@@@ -7856,11 -6292,9 +8009,11 @@@ msgstr "принять 'нет' как
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FILE|добавить таблицу ключей в список таблиц ключей"
+#: sm/gpgsm.c:313
msgid "|USER-ID|use USER-ID as default secret key"
- msgstr "|USER-ID|использовать USER-ID как основной закрытый ключ"
+ msgstr "|USER-ID|использовать USER-ID как основной секретный ключ"
+#: sm/gpgsm.c:323 tools/gpgconf-comp.c:789
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|искать ключи на данном сервере ключей"
@@@ -8168,7 -6544,6 +8321,7 @@@ msgstr " постоянно заг
msgid " runtime cached certificates: %u\n"
msgstr "сертификатов в буфере времени исполнения: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
msgid "certificate already cached\n"
msgstr "сертификат уже в буфере\n"
@@@ -8176,8 -6550,6 +8329,8 @@@
msgid "certificate cached\n"
msgstr "сертификат в буфере\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, c-format
msgid "error caching certificate: %s\n"
msgstr "ошибка помещения сертификата в буфер: %s\n"
@@@ -8236,7 -6597,6 +8389,7 @@@ msgstr "удаление файла б�
msgid "not removing file '%s'\n"
msgstr "не удаляю файл '%s'\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, c-format
msgid "error closing cache file: %s\n"
msgstr "ошибка закрытия файла буфера: %s\n"
@@@ -8466,160 -6782,130 +8619,160 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "ошибка получения данных из файла буфера: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "недопустимая хэш-функция '%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr "сбой gcry_md_open для алгоритма %d: %s\n"
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr "из libksba получено недопустимое S-выражение\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, c-format
msgid "converting S-expression failed: %s\n"
msgstr "сбой преобразования S-выражения: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "сбой создания S-выражения: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, c-format
msgid "ksba_crl_parse failed: %s\n"
msgstr "сбой ksba_crl_parse: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, c-format
msgid "error getting update times of CRL: %s\n"
msgstr ""
"ошибка получения времен обновления списка отозванных сертификатов: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
"времена обновления этого списка отозванных сертификатов: текущее=%s, "
"следующее=%s\n"
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr "не задано nextUpdate; предполагаю срок действия в один день\n"
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, c-format
msgid "error getting CRL item: %s\n"
msgstr "ошибка получения элемента списка отозванных сертификатов: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "ошибка вставки элемента во временный файл буфера: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "в списке отозванных сертификатов не найден издатель списка: %s\n"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
"поиск сертификата издателя списка отозванных сертификатов по "
"authorityKeyIdentifier\n"
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, c-format
msgid "CRL signature verification failed: %s\n"
msgstr "сбой проверки подписи списка отозванных сертификатов: %s\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr ""
- "ошибка проверки действительности сертификата издателя списка отозванных "
+ "ошибка проверки достоверности сертификата издателя списка отозванных "
"сертификатов: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "сбой ksba_crl_new: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "сбой ksba_crl_set_reader: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "удален залипший временный файл буфера '%s'\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "проблема удаления залипшего временного файла буфера '%s': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "ошибка создания временного файла буфера '%s': %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, c-format
msgid "crl_parse_insert failed: %s\n"
msgstr "сбой crl_parse_insert: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "ошибка завершения временного файла буфера '%s': %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "ошибка закрытия временного файла буфера '%s': %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
"Внимание: новый список отозванных сертификатов тоже слишком стар; срок "
"действия истек %s - тем не менее загружаю\n"
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
"новый список отозванных сертификатов тоже слишком стар; срок действия истек "
"%s\n"
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr "неизвестное критическое расширение списка отозванных сертификатов %s\n"
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "ошибка чтения расширений списка отозванных сертификатов: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, c-format
msgid "creating cache file '%s'\n"
msgstr "создание файла буфера '%s'\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "проблема при переименовании '%s' в '%s': %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
@@@ -8627,12 -6913,10 +8780,12 @@@ msgstr "
"сбой обновления файла каталога - запись буфера будет утеряна при следующем "
"запуске программы\n"
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr "Начало вывода списка отозванных сертификатов (полученного через %s)\n"
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
@@@ -8640,56 -6924,45 +8793,56 @@@ msgstr "
" Ошибка: Список отозванных сертификатов использован не будет, потому что "
"после обновления он все равно слишком стар!\n"
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
" Ошибка: Список отозванных сертификатов не будет использован из-за "
"неизвестного критического расширения!\n"
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr " Ошибка: Список отозванных сертификатов использован не будет\n"
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
" Ошибка: Этот список отозванных сертификатов в буфере, возможно, подменен!\n"
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
msgid " WARNING: invalid cache record length\n"
msgstr "Внимание: найдена недопустимая длина буферной записи\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, c-format
msgid "problem reading cache record: %s\n"
msgstr "проблема при чтении буферной записи: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, c-format
msgid "problem reading cache key: %s\n"
msgstr "проблема при чтении ключа буфера: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "ошибка чтения записи буфера из базы данных: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr "Конец вывода списка отозванных сертификатов\n"
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "сбой crl_fetch через DP: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "сбой crl_cache_insert через DP: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "сбой crl_cache_insert через издателя: %s\n"
@@@ -8735,11 -6998,9 +8888,11 @@@ msgstr "ошибка получени�
msgid "error retrieving '%s': http status %u\n"
msgstr "ошибка получения '%s': статус HTTP %u\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
#| msgid "CRL access not possible due to disabled %s\n"
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr ""
"Доступ к списку отозванных сертификатов невозможен\n"
"из-за того, что не задействуется %s\n"
@@@ -8749,57 -7009,44 +8902,57 @@@
msgid "certificate search not possible due to disabled %s\n"
msgstr "поиск сертификата невозможен из-за того, что не задействуется %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr "использовать OCSP вместо списков отозванных сертификатов"
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr "проверять, работает ли dirmngr"
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
msgid "add a certificate to the cache"
msgstr "добавить сертификат в буфер"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
msgid "validate a certificate"
msgstr "проверить сертификат"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
msgid "lookup a certificate"
msgstr "искать сертификат"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
msgid "lookup only locally stored certificates"
msgstr "искать только сертификаты, хранящиеся локально"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr "--lookup задает URL"
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr "загрузить список отозванных сертификатов в dirmngr"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr "особый режим для применения со Squid"
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
msgid "expect certificates in PEM format"
msgstr "рассматривать сертификаты в формате PEM"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
msgstr "принудительно использовать основной ответчик OCSP"
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
"Вызов: dirmngr-client [параметры] [файл_сертификата|шаблон] (-h для "
"подсказки)\n"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -8808,223 -7055,152 +8961,196 @@@
msgstr ""
"Синтаксис: dirmngr-client [параметры] [файл_сертификата|шаблон]\n"
"Проверка сертификата X.509 по списку отозванных сертификатов или по OCSP\n"
- "Процесс возвращает 0, если сертификат действителен, 1, если недействителен,\n"
+ "Процесс возвращает 0, если сертификат достоверен, 1, если недостоверен,\n"
"и другие коды ошибок при общих отказах\n"
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "ошибка чтения сертификата из stdin: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "ошибка чтения сертификата из %s: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr "сертификат слишком велик, чтобы иметь какой-то смысл\n"
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, c-format
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "не могу подключиться к dirmngr: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, c-format
msgid "lookup failed: %s\n"
msgstr "сбой при поиске: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "сбой при загрузке списка отозванных сертификатов '%s': %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr "демон dirmngr работает\n"
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "сбой при проверке сертификата: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
msgid "certificate is valid\n"
- msgstr "сертификат действителен\n"
+ msgstr "сертификат достоверен\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
msgid "certificate has been revoked\n"
msgstr "сертификат был отозван\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, c-format
msgid "certificate check failed: %s\n"
msgstr "сбой при проверке сертификата: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr "получен статус: '%s'\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "ошибка записи в кодировке base64: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "сбой размещения контекста Assuan: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr "видимо, dirmngr не работает\n"
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr "dirmngr не выполняется - запуск\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr "неправильная переменная окружения %s\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "протокол dirmngr версии %d не поддерживается\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "не могу подключиться к dirmngr - пробую запасной вариант\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "не могу подключиться к dirmngr: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "запрос '%s' не поддерживается\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr "нужно абсолютное имя файла\n"
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr "поиск '%s'\n"
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr "запустить как службу окон (фоновый режим)"
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr "вывести содержание буфера списков отозванных сертификатов"
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|загрузить список отозванных сертификатов из файла FILE в буфер"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|получить список отозванных сертификатов из URL"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr "выключить dirmngr"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr "записать буфер на диск"
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
msgid "run without asking a user"
msgstr "работать, не спрашивая пользователя"
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr "принудительная загрузка устаревших списков отозванных сертификатов"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr "разрешить посылку запросов OCSP"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr "запретить использование HTTP"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr "запретить использование LDAP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
"игнорировать точки распространения списков отозванных сертификатов по HTTP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
"игнорировать точки распространения списков отозванных сертификатов по LDAP"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr "игнорировать URL служб OCSP из сертификата"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|перенаправлять все запросы HTTP на URL"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|использовать хост HOST для поиска LDAP"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "не пользоваться запасными хостами с --ldap-proxy"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|взять список серверов LDAP из файла FILE"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
"добавлять новые серверы, обнаруженные в точках распространения списков "
"отозванных сертификатов, в список серверов"
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|установить время ожидания LDAP N секунд"
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|использовать ответчик OCSP по URL"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|ответ OCSP подписан сертификатом с отпечатком FPR"
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr "|N|не возвращать более чем N результатов одного поиска"
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
"|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
"по TLS"
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9033,11 -7209,9 +9159,11 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. в руководстве \"info\")\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Вызов: @DIRMNGR@ [параметры] (-h для подсказки)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9045,77 -7219,60 +9171,77 @@@ msgstr "
"Синтаксис: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
"Доступ к OCSP, серверам ключей, спискам отозванных сертификатов для @GNUPG@\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "допустимые уровни отладки: %s\n"
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, c-format
msgid "usage: %s [options] "
msgstr "вызов: %s [параметры] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
msgid "colons are not allowed in the socket name\n"
msgstr "двоеточия в имени сокета недопустимы\n"
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: слишком длинная строка - пропущена\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: обнаружен неверный отпечаток\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: ошибка чтения: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: мусор в конце строки игнорируется\n"
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "получен SIGHUP - повторное чтение настроек и запись буферов на диск\n"
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr "получен SIGUSR2 - действие не определено\n"
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr "получен SIGTERM - завершение работы ...\n"
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "получен SIGTERM - осталось %d активных соединений\n"
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
msgid "shutdown forced\n"
msgstr "принудительное выключение\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr "получен SIGINT - немедленное завершение работы\n"
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "получен сигнал %d - действие не определено\n"
@@@ -9356,12 -7462,10 +9482,12 @@@ msgstr "добавление '%s:%d' �
msgid "malloc failed: %s\n"
msgstr "сбой malloc: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: недопустимый шаблон '%s'\n"
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search достиг предела сервера по размеру\n"
@@@ -9393,13 -7491,11 +9519,13 @@@ msgstr "ошибка чтения из
msgid "response from server too large; limit is %d bytes\n"
msgstr "слишком длинный ответ сервера; предел - %d байт\n"
+#: dirmngr/ocsp.c:139
#, fuzzy
#| msgid "OCSP request not possible due to disabled HTTP\n"
- msgid "OCSP request not possible due to TOR mode\n"
+ msgid "OCSP request not possible due to Tor mode\n"
msgstr "запрос OCSP невозможен из-за отключения HTTP\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr "запрос OCSP невозможен из-за отключения HTTP\n"
@@@ -9542,71 -7608,60 +9668,76 @@@ msgstr "ответчик OCSP возв�
msgid "OCSP responder returned an too old status\n"
msgstr "ответчик OCSP возвратил слишком старый статус\n"
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "сбой assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr "нет сервера LDAP"
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr "в ID сертификата нет серийного номера"
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "сбой assuan_inquire: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "сбой fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, c-format
msgid "error sending data: %s\n"
msgstr "ошибка отправки данных: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "сбой start_cert_fetch: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "сбой fetch_next_cert: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "превышено max_replies %d\n"
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "сбой размещения контекста Assuan: %s\n"
+
++#: dirmngr/server.c:2430
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "сбой инициализации сервера: %s\n"
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "сбой регистрации команд с помощью Assuan: %s\n"
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема с приемом Assuan: %s\n"
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "сбой обработки Assuan: %s\n"
@@@ -9805,11 -7812,9 +9936,11 @@@ msgstr "|N|считать фразу-п
msgid "do not allow the reuse of old passphrases"
msgstr "не разрешать повторное использование старых фраз-паролей"
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:771
msgid "|NAME|use NAME as default secret key"
- msgstr "|NAME|использовать NAME как основной закрытый ключ"
+ msgstr "|NAME|использовать NAME как основной секретный ключ"
+#: tools/gpgconf-comp.c:697 tools/gpgconf-comp.c:774
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|зашифровывать также для ID пользователя NAME"
@@@ -9855,13 -7850,11 +9986,13 @@@ msgstr "Параметры, управ�
msgid "Options controlling the interactivity and enforcement"
msgstr "Параметры, управляющие интерактивностью и принудительными действиями"
+#: tools/gpgconf-comp.c:911
#, fuzzy
#| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr "Параметры, управляющие безопасностью"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "Настройки серверов HTTP"
@@@ -9897,11 -7882,9 +10028,11 @@@ msgstr "Демон криптограф
msgid "GPG for S/MIME"
msgstr "GPG для S/MIME"
+#: tools/gpgconf-comp.c:1063
msgid "Key Acquirer"
- msgstr ""
+ msgstr "Диспетчер ключей"
+#: tools/gpgconf-comp.c:1064
msgid "PIN and Passphrase Entry"
msgstr "Ввод PIN и фраз-паролей"
@@@ -10024,11 -7980,9 +10155,11 @@@ msgstr "класс средства (co
msgid "program filename"
msgstr "имя файла программы"
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
- msgstr "файл закрытого ключа (обязателен)"
+ msgstr "файл секретного ключа (обязателен)"
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr "имя входного файла (по умолчанию stdin)"
diff --cc po/sk.gmo
index 563e2cc,0000000..3b83666
mode 100644,000000..100644
Binary files differ
diff --cc po/sk.po
index 927016a,f23304b..f08ddbc
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "nespr�vne heslo
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr ""
@@@ -80,75 -68,59 +80,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "nespr�vne heslo"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "riadok je pr�li� dlh�\n"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "heslo je pr�li� dlh�\n"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "Neplatn� znak ve mene\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "nespr�vne MPI"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "nespr�vne heslo"
@@@ -158,25 -129,11 +158,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -249,11 -193,9 +249,11 @@@ msgstr "Pros�m, vlo�te heslo; toto je t
msgid "failed to create stream from socket: %s\n"
msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -396,42 -312,28 +396,42 @@@ msgstr "
"Mo�nosti:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "s dodato�n�mi inform�ciami"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "by� o trochu tich��"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 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:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -516,11 -401,6 +516,11 @@@ msgstr "nepodporovan�
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@@ -538,145 -416,107 +538,144 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: nem�em vytvori�: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, 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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: adres�r vytvoren�\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, 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:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: presko�en�: %s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
@@@ -692,8 -530,6 +691,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -537,6 +700,9 @@@ msgstr "
"@Pr�kazy:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -757,7 -582,6 +756,7 @@@ msgstr "Zru�i�
msgid "error while asking for the passphrase: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@@ -940,8 -730,6 +939,8 @@@ msgstr "chyba pri vytv�ran� hesla: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@@ -1094,7 -850,6 +1093,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1113,7 -865,6 +1112,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1407,7 -1098,6 +1406,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "nespracovan�"
@@@ -1591,19 -1243,14 +1590,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "Vlo�te heslo: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "tajn� k��� nie je dostupn�"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nemo�no previes� v d�vkovom m�de\n"
@@@ -1618,222 -1263,171 +1617,222 @@@ msgstr "Tento pr�kaz nie je v m�doch %
msgid "Reset Code not or not anymore available\n"
msgstr "tajn� �asti k���a nie s� dostupn�\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "V� v�ber? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr ""
- #: g10/card-util.c:528
++#: g10/card-util.c:534
#, fuzzy
msgid "male"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "female"
msgstr "enable"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
#, fuzzy
msgid "unspecified"
msgstr "D�vod nebol �pecifikovan�"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
#, fuzzy
msgid "not forced"
msgstr "nespracovan�"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr ""
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr ""
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr ""
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:693
++#: g10/card-util.c:699
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "chyba pri z�pise s�boru k���ov (keyring) `%s': %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
#, fuzzy
msgid "Language preferences: "
msgstr "aktualizova� predvo�by"
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "neplatn� znak v re�azci s predvo�bami\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "neplatn� znak v re�azci s predvo�bami\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
#, fuzzy
msgid "CA fingerprint: "
msgstr "vyp�sa� fingerprint"
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
#, fuzzy
msgid "not an OpenPGP card"
msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokr�hlen� na %u bitov\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1841,155 -1435,120 +1840,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (len na �ifrovanie)\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Neplatn� v�ber.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Skuto�ne podp�sa�? "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "ukon�i� toto menu"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
#, fuzzy
msgid "show admin commands"
msgstr "konfliktn� pr�kazy\n"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "uk�za� t�to pomoc"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
#, fuzzy
msgid "list all available data"
msgstr "K��� k dispoz�cii na: "
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
#, fuzzy
msgid "change the login name"
msgstr "zmeni� dobu platnosti"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
#, fuzzy
msgid "change the language preferences"
msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
#, fuzzy
msgid "change a CA fingerprint"
msgstr "vyp�sa� fingerprint"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
#, fuzzy
msgid "generate new keys"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
#, fuzzy
msgid "Admin-only command\n"
msgstr "konfliktn� pr�kazy\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "konfliktn� pr�kazy\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
@@@ -1997,78 -1555,64 +1996,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output pre tento pr�kaz nefunguje\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nemo�no otvori� `%s'\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba pri ��tan� bloku k���a: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ msgid "key \"%s\" not found\n"
+ msgstr "k��� `%s' nebol n�jden�: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(pokia� neur��te k��� jeho fingerprintom)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "bez parametra \"--yes\" to nemo�no v d�vkovom m�de previes�\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Zmaza� tento k��� zo s�boru k���ov? "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Toto je tajn� k���! - skuto�ne zmaza�? "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "key"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Verejn� k���e: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "inform�cie o d�veryhodnosti vlastn�ka k���a vymazan�\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
@@@ -2119,7 -1655,6 +2124,7 @@@ msgstr "
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:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr ""
@@@ -2208,294 -1727,247 +2213,314 @@@ msgstr "VAROVANIE: nem�em vymaza� do�a
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "VAROVANIE: nem�em vymaza� do�asn� adres�r `%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:67
++#: g10/export.c:81
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
- #: g10/export.c:69
++#: g10/export.c:83
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "nepou�ite�n� tajn� k���"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:814
++#: g10/export.c:902
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: presko�en�: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
#, fuzzy
msgid "[User ID not found]"
msgstr "[User id not found]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "vyp�sa� fingerprint"
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "neplatn� parameter pre import\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
+
# c-format
- #: g10/getkey.c:1777
++#: g10/getkey.c:1890
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "�ifrova� d�ta"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "�ifrovanie len so symetrickou �ifrou"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "de�ifrova� d�ta (implicitne)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "verifikova� podpis"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "vyp�sa� zoznam k���ov"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "vyp�sa� zoznam k���ov a podpisov"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
#, fuzzy
msgid "list and check key signatures"
msgstr "skontrolova� podpisy k���ov"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "vyp�sa� zoznam k���ov a fingerprintov"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "vyp�sa� zoznam tajn�ch k���ov"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "vytvori� revoka�n� certifik�t"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "podp�sa� k���"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "podp�sa� k��� lok�lne"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "podp�sa� k���"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "podp�sa� k��� lok�lne"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "podp�sa� alebo modifikova� k���"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "zmeni� heslo"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "exportova� k���e"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "exportova� k���e na server k���ov"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importova� k���e zo servera k���ov"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "vyh�ada� k���e na serveri k���ov"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "aktualizova� v�etky k���e zo servera k���ov"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importova�/zl��i� k���e"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "aktualizova� datab�zu d�very"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|algo [s�bory]|vyp� hash"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|MENO|�ifrova� pre MENO"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, 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:502
++#: g10/gpg.c:513
#, 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:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "pou�i� k�nonick� textov� m�d"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "nevykona� �iadne zmeny"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "vy�iada� potvrdenie pred prep�san�m"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2504,7 -1976,6 +2529,7 @@@ msgstr "
"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
"mo�nost�)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2524,13 -1995,11 +2549,13 @@@ msgstr "
" --list-keys [men�] vyp�sa� k���e\n"
" --fingerprint [men�] vyp�sa� fingerprinty\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2545,7 -2014,6 +2570,7 @@@ msgstr "
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2553,594 -2021,520 +2578,659 @@@ msgstr "
"\n"
"Podporovan� algoritmy:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Verejn� k���e: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "�ifry: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Kompresia: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pou�itie: gpg [mo�nosti] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "konfliktn� pr�kazy\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, 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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, 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:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, 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:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
#, 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:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
#, 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:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "nastavi� k��� ako neplatn� (disable)"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "nezn�my implicitn� adres�t `%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "nezn�my implicitn� adres�t `%s'\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
#, 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:2872
++#: g10/gpg.c:3231
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program m�e vytvori� s�bor core!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prep�e %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�va s %s zmysel!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� predvo�by\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s e�te nepracuje s %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "neplatn� hashovac� algoritmus `%s'\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "neplatn� hashovac� algoritmus `%s'\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [meno s�boru]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [meno s�boru]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [meno s�boru]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [meno s�boru]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [meno s�boru]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [meno s�boru]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [meno s�boru]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key id u��vate�a"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key id u��vate�a"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u��vate�a [pr�kazy]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id u��vate�a"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo posla� k��� na server: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa n�js� server: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualiz�cia servera zlyhala: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "chyba pri vytv�ran� hesla: %s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[meno s�boru]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Za�nite p�sa� svoju spr�vu ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "Zmaza� tento k��� zo s�boru k���ov? "
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "konflikt �asov�ho raz�tka"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3316,7 -2676,6 +3406,7 @@@ msgstr "
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
@@@ -3326,7 -2684,6 +3416,7 @@@
msgid "key %s: %s\n"
msgstr "presko�en� `%s': %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3351,7 -2704,6 +3441,7 @@@ msgstr "k��� %08lX: ch�ba platn� identi
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
@@@ -3361,263 -2712,226 +3451,278 @@@
msgid "key %s: new key - skipped\n"
msgstr "k��� %08lX: nov� k��� - presko�en�\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "zapisujem do '%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, 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:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "k��� %08lX: \"%s\" bez zmeny\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "k��� %08lX: tajn� k��� importovan�\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, 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:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, 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:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, 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:2135
++#: g10/import.c:2177
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "k��� %08lX: podk��� presko�en�\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, 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"
@@@ -3644,62 -2954,53 +3749,67 @@@ msgstr "s�bor k���ov (keyring) `%s' vyt
msgid "keyring '%s' created\n"
msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "chyba pri ��tan� `%s': %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[revok�cia]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[podpis k���a n�m sam�m]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 zl� podpis\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d zl�ch podpisov\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "zisten� 1 identifik�tor u��vate�a bez platn�ho podpisu n�m sam�m\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr ""
"zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3712,63 -3013,53 +3822,68 @@@ msgstr "
"kontrolou fingerprintov z r�znych zdrojov...)?\n"
"\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = D�verujem �iasto�ne\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = D�verujem �plne\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Nemo�no podp�sa�.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Skuto�ne podp�sa�? "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3777,11 -3068,9 +3892,11 @@@ msgstr "
"Podpis k���a \"%s\" n�m sam�m je\n"
"podpis vo form�te PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3791,11 -3080,9 +3906,11 @@@ msgstr "
"je len lok�lny.\n"
"\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3805,43 -3092,34 +3920,43 @@@ msgstr "
"je len lok�lny.\n"
"\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Ni� na podp�sanie k���om %08lX\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Platnos� k���a vypr�ala!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnos� k���a vypr�� %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3851,32 -3129,26 +3966,32 @@@ msgstr "
"patr� vy��ie uvedenej osobe?\n"
"Pokia� nepozn�te odpove�, zadajte \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpoviem.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) V�bec som to nekontroloval(a).%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) �iasto�ne som to overil(a).%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ve�mi d�kladne som to overil(a).%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "V� v�ber? ('?' - viac inform�ci�): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3885,28 -3157,24 +4000,28 @@@ msgstr "
"Ste si ist�, �e chcete podp�sa� tento k���\n"
"svoj�m k���om: \""
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ide o podpis k���a n�m sam�m\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
@@@ -3914,241 -3182,190 +4029,241 @@@
"Podpis bude ozna�en� ako neexportovate�n�.\n"
"\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"V�bec som tento k��� neoveril.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"�iasto�ne som overil tento k���.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Velmi d�kladne som overil tento k���.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Skuto�ne podp�sa�? "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "pres�vam podpis k���a na spr�vne miesto\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "ulo�i� a ukon�i�"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
#, fuzzy
msgid "show key fingerprint"
msgstr "vyp�sa� fingerprint"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Podpisov� not�cia: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "vyberte identifik�tor u��vate�a N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
#, fuzzy
msgid "select subkey N"
msgstr "vyberte identifik�tor u��vate�a N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
#, fuzzy
msgid "check signatures"
msgstr "revokova� podpisy"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "podp�sa� k��� lok�lne"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "prida� identifik�tor u��vate�a"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "prida� fotografick� ID"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
#, fuzzy
msgid "delete selected user IDs"
msgstr "zmaza� identifik�tor u��vate�a"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
#, fuzzy
msgid "delete selected subkeys"
msgstr "zmaza� sekund�rny k���"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "prida� revoka�n� k���"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Nem�ete zmeni� dobu platnosti k���a verzie 3\n"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "vyp�sa� zoznam predvolieb (podrobne)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "zmeni� heslo"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revokova� identifik�tor u��vate�a"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revokova� sekund�rny k���"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
#, fuzzy
msgid "enable key"
msgstr "nastavi� k��� ako platn� (enable)"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
#, fuzzy
msgid "disable key"
msgstr "nastavi� k��� ako neplatn� (disable)"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
#, fuzzy
msgid "show selected photo IDs"
msgstr "uk�za� fotografick� ID"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Tajn� k��� je dostupn�.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4156,267 -3373,210 +4271,267 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "K��� revokovan�."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "nezn�ma trieda podpisu"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Nem�ete zmaza� posledn� id u��vate�a!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Mus�te vybra� aspo� jeden k���.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "nem�em otvori� `%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Mus�te vybra� aspo� jeden k���.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Skuto�ne chcete zmaza� tento k���? "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Skuto�ne revokova� toto id u��vate�a? "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Skuto�ne chcete revokova� tento k���? "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Skuto�ne chcete revokova� vybran� k���e? "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Skuto�ne chcete revokova� tento k���? "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
#, fuzzy
msgid "Set preference list to:\n"
msgstr "nastavi� zoznam predvolieb"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Skuto�ne aktualizova� predvo�by? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Ulo�i� zmeny? "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Ukon�i� bez ulo�enia? "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, fuzzy, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Ni� na podp�sanie k���om %08lX\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Charakteristiky: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
#, fuzzy
msgid "Notations: "
msgstr "Not�cie: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Tento k��� m�e by� revokovan� k���om %s "
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Tento k��� m�e by� revokovan� k���om %s "
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
#, fuzzy
msgid "(sensitive)"
msgstr "(citliv� inform�cia)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s: nem�em vytvori�: %s\n"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revokovan�]"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [platnos� skon��: %s]"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [platnos� skon��: %s]"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, fuzzy, c-format
msgid "usage: %s"
msgstr " d�vera: %c/%c"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, fuzzy, c-format
msgid "trust: %s"
msgstr " d�vera: %c/%c"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4424,19 -3584,14 +4539,19 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revokovan�]"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4444,17 -3599,14 +4559,17 @@@ msgstr "
"VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
"sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Nem�ete zmeni� dobu platnosti k���a verzie 3\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4463,79 -3615,62 +4578,79 @@@ msgstr "
"VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m�e v niektor�ch\n"
" verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Zmazan� %d podpis.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Zmazan�ch %d podpisov.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Ni� nebolo zmaznan�.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
#, fuzzy
msgid "invalid"
msgstr "neplatn� sp�sob reprezent�cie v ASCII"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4544,193 -3679,158 +4659,200 @@@ msgstr "
"VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m�e v niektor�ch\n"
" verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem�e by� zru�en�!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
- #: g10/keyedit.c:3974
++#: g10/keyedit.c:4014
#, fuzzy
- msgid "Please select at most one subkey.\n"
- msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nem�ete zmeni� dobu platnosti k���a verzie 3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr�ovo certifikovan�\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
#, fuzzy
msgid "Enter the notation: "
msgstr "Podpisov� not�cia: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Prep�sa� (a/N)? "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
+
++#: g10/keyedit.c:5014
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "id u��vate�a: \""
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " podp�san� %08lX v %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (nexeportovate�n�)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnos� podpisu vypr�� %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
#, fuzzy
msgid "Not signed by you.\n"
msgstr " podp�san� %08lX v %s%s\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
#, fuzzy
msgid " (non-revocable)"
msgstr " (nexeportovate�n�)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokovan� %08lX v %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Chyst�te sa revokova� tieto podpisy:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "neexistuje tajn� k���\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4773,14 -3865,10 +4895,14 @@@ msgstr "zapisujem podpis k���a sebou sa
msgid "writing key binding signature\n"
msgstr "zapisujem \"key-binding\" podpis\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
@@@ -5078,41 -4117,36 +5200,46 @@@ msgstr "
msgid "Real name: "
msgstr "Meno a priezvisko: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Neplatn� znak ve mene\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Meno nem�e za��na� ��slicou\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "E-mailov� adresa: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Neplatn� e-mailov� adresa\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Koment�r: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Neplatn� znak v koment�ri\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Pou��vate znakov� sadu `%s'.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5123,7 -4157,6 +5250,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do po�a meno alebo koment�r nep�te, pros�m, e-mailov� adresu.\n"
@@@ -5138,35 -4171,28 +5265,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "mMkKeEPpUu"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Najsk�r, pros�m, opravte chybu\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5174,23 -4200,19 +5301,23 @@@ msgstr "
"Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5202,7 -4224,6 +5329,7 @@@ msgstr "
"tohto programu s parametrom \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5214,12 -4235,10 +5341,12 @@@ msgstr "
"pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
"entropie.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5227,56 -4246,45 +5354,56 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' je u� skomprimovan�\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Pou�i� napriek tomu tento k���? "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
msgid "creating anyway\n"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Vytv�ranie k���a bolo zru�en�.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "zapisujem verejn� k��� do `%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5285,7 -4293,6 +5412,7 @@@ msgstr "
"Tento k��� nem�e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
"sekund�rneho k���a na tento ��el m�ete pou�i� pr�kaz \"--edit-key\".\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5293,7 -4300,6 +5420,7 @@@ msgstr "
"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
"je probl�m so syst�mov�m �asom)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5301,248 -4307,196 +5428,248 @@@ msgstr "
"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
"je probl�m so syst�mov�m �asom)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Skuto�ne vytvori�? "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "nikdy "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritick� podpisov� politika: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Podpisov� politika: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritick� podpisov� not�cia: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Podpisov� not�cia: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 zl� podpis\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d zl�ch podpisov\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "s�bor k���ov (keyring)"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "presko�en� `%s': %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Prim�rny fingerprint k���a:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Fingerprint podk���a:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " Prim�rny fingerprint k���a:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Fingerprint podk���a:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint k���a ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, fuzzy, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROVANIE: nem�em vymaza� do�asn� s�bor (%s) `%s': %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"podp�san� Va��m k���om %08lX v %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROVANIE: nem�em vymaza� do�asn� s�bor (%s) `%s': %s\n"
@@@ -5576,7 -4524,6 +5703,7 @@@ msgstr "d�ta za�ifrovan� verejn�m k���o
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
@@@ -5626,261 -4564,209 +5753,261 @@@ msgstr "de�ifrovanie o.k.\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "p�vodn� meno s�boru='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"samostatn� revoka�n� certifik�t - pou�ite \"gpg --import\", ak ho chcete "
"vyu�i�\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
#, fuzzy
msgid "no signature found\n"
msgstr "Dobr� podpis od \""
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ZL� podpis od \""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypr�anou platnos�ou od \""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Dobr� podpis od \""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "verifik�cia podpisu potla�en�\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, 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:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "K��� k dispoz�cii na: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[neist�] "
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnos� podpisu vypr�� %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "bin�rne"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "textov� m�d"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "nezn�me"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "nezn�my algoritmus verejn�ho k���a"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem�em overi� podpis: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "toto nie je podpis oddelen� od dokumentu\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatn� podpis triedy 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis star�ho typu (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "nemo�no otvori� s�bor: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "nem�em pracova� s algoritmom verejn�ho k���a %d\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "�ifrovac� algoritmus nie je implementovan�"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s podpis, hashovac� algoritmus %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s podpis, hashovac� algoritmus %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "pou�ite namiesto neho \"%s%s\" \n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Nekomprimovan�"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
#, fuzzy
msgid "uncompressed|none"
msgstr "Nekomprimovan�"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "��tam mo�nosti z `%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ msgid "unknown weak digest '%s'\n"
+ msgstr "nezn�ma trieda podpisu"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6075,31 -4928,24 +6202,31 @@@ msgstr "Je t�to fotografia spr�vna (a/N
msgid "unable to display photo ID!\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "D�vod nebol �pecifikovan�"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "K��� je nahraden�"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "K��� bol skompromitovan�"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "K��� sa u� nepou��va"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Identifik�tor u��vate�a u� neplat�"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "d�vod na revok�ciu: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "revoka�n� pozn�mka: "
@@@ -6113,100 -4959,81 +6240,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMuUsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Nie je priraden� �iadna hodnota d�very k:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alias \""
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Neviem\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Ned�verujem\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = D�verujem absol�tne\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = sp� do hlavn�ho menu\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = presko�i� tento k���\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
#, fuzzy
msgid " q = quit\n"
msgstr " u = ukon�i�\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Va�e rozhodnutie? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Skuto�ne chcete nastavi� pre tento k��� absol�tnu d�veru? "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certifik�ty ved�ce k fin�lnemu d�veryhodn�mu k���u:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Tento k��� patr� n�m (m�me zodpovedaj�ci tajn� k���)\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6218,116 -5045,91 +6345,116 @@@ msgstr "
"odpoveda� �no\n"
"\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Pou�i� napriek tomu tento k���? "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
#, 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:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Tento podpis je pravdepodobne FALO�N�.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: presko�en�: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, 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:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6335,75 -5137,58 +6462,75 @@@ msgstr "
"\n"
"Nap�te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Verejn� k��� je neplatn� (disabled).\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "�iadne platn� adresy\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, 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:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "d�ta neboli ulo�en�; na ich ulo�enie pou�ite prep�na� \"--output\"\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Podpis oddelen� od dokumentu.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "��tam �tandardn� vstup (stdin) ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "ch�baj� podp�san� d�ta\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "nem�em otvori� podp�san� d�ta '%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nem�em otvori� podp�san� d�ta '%s'\n"
@@@ -6442,8 -5220,6 +6569,8 @@@ msgstr "POZN�MKA: platnos� tajn�ho k���
msgid "Note: key has been revoked"
msgstr "POZN�MKA: k��� bol revokovan�"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet zlyhala: %s\n"
@@@ -6453,43 -5228,39 +6580,49 @@@
msgid "key %s has no user IDs\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Bude revokovan�:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Toto je citliv� revoka�n� k���)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Tajn� k��� je dostupn�.\n"
+
++#: g10/revoke.c:328
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "Vyn�ten� ASCII textov� v�stup.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet zlyhala: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6497,19 -5268,27 +6630,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ msgid "secret key \"%s\" not found\n"
+ msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6527,33 -5306,26 +6673,33 @@@ msgstr "
"Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m�e uklada� d�ta a\n"
"spr�stupni� ich in�m!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Zru�i�"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Ak chcete, nap�te popis; ukon�ite pr�zdnym riadkom:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "D�vod na revok�ciu: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(�iadny popis)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Je to v poriadku? "
@@@ -6579,37 -5347,30 +6725,37 @@@ msgstr "
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROVANIE: konflikt hashu podpisu v spr�ve\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr�ovo certifikovan�\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = pros�m o viac inform�c�i\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"VAROVANIE: podpisovac� podk��� %08lX m� neplatn� kr�ov� certifik�ciu\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, fuzzy, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6617,7 -5378,6 +6763,7 @@@ msgstr "
"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
"je probl�m so syst�mov�m �asom)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, fuzzy, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6625,29 -5385,24 +6771,29 @@@ msgstr "
"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
"je probl�m so syst�mov�m �asom)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "POZN�MKA: podpisov�mu k���u %08lX skon�ila platnos� %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "POZN�MKA: k��� bol revokovan�"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, fuzzy, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"predpoklad�m neplatn� podpis k���om %08lX, preto�e je nastaven� nezn�my "
"kritick� bit\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
@@@ -6692,34 -5441,28 +6838,34 @@@ msgstr "
msgid "signing:"
msgstr "podpisujem:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude pou�it� �ifrovanie %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"k��� nie je ozna�en� ako nedostato�ne bezpe�n� - nem�em ho pou�i� s "
"falo�n�m RNG!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "presko�en� `%s': duplikovan�\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"presko�en� `%s': toto je vygenerovan� PGP k��� pod�a algoritmu ElGamal,\n"
"podpisy vytvoren� t�mto k���om nie s� bezpe�n�!\n"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
@@@ -6769,7 -5504,6 +6915,7 @@@ msgstr "chyba pri h�adan� z�znamu d�ver
msgid "read error in '%s': %s\n"
msgstr "chyba pri ��tan�: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
@@@ -6798,7 -5527,6 +6944,7 @@@ msgstr "z�znam v datab�ze d�very %lu: z
msgid "trustdb transaction too large\n"
msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "nem�em zavrie� `%s': %s\n"
@@@ -6915,119 -5620,95 +7061,119 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "`%s' nie je platn� dlh� keyID\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "k��� %08lX: akceptovan� ako d�veryhodn� k���\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "k��� %08lX sa v datab�ze d�very vyskytuje viac ako raz\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"k��� %08lX: nen�jden� verejn� k��� k d�veryhodn�mu k���u - presko�en�\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "k��� ozna�en� ako absol�tne d�veryhodn�.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "z�znam d�very %lu, typ po�. %d: ��tanie zlyhalo: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr ""
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "dal�ia kontrola datab�zy d�very %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "pros�m vykonajte --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "kontrolujem datab�zu d�very\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u %08lX nebol n�jden�\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr ""
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
@@@ -7264,11 -5896,9 +7410,11 @@@ msgstr "
msgid "verify CHV%d failed: %s\n"
msgstr "nepodarilo posla� k��� na server: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr ""
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr ""
@@@ -7409,12 -6011,10 +7555,12 @@@ msgstr "%s podpis, hashovac� algoritmu
msgid "signatures created so far: %lu\n"
msgstr ""
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@@ -7435,7 -6032,6 +7581,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7495,12 -6079,10 +7641,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7932,7 -6422,6 +8078,7 @@@ msgstr "chyba pri vytv�ran� s�boru k���
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8534,7 -6903,6 +8680,7 @@@ msgstr "nespr�vny certifik�t
msgid " runtime cached certificates: %u\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
@@@ -8544,8 -6911,6 +8690,8 @@@
msgid "certificate cached\n"
msgstr "duplicita predvo�by %c%lu\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
@@@ -8607,7 -6961,6 +8753,7 @@@ msgstr "zmazanie bloku k���a sa nepodar
msgid "not removing file '%s'\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@@ -8831,220 -7140,177 +8977,220 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
#, fuzzy
#| msgid "invalid response from agent\n"
msgid "got an invalid S-expression from libksba\n"
msgstr "neplatn� reakcia od agenta\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "nemo�no otvori� s�bor: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet zlyhala: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
msgid "error getting CRL item: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "zapisujem do '%s'\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "vytvori� revoka�n� certifik�t"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "verifik�cia podpisu potla�en�\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "nem�em vytvori� adres�r `%s': %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "nem�em vytvori� adres�r `%s': %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "zapisujem do '%s'\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
msgid "problem reading cache key: %s\n"
msgstr "rev? probl�m overenia revok�cie: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
@@@ -9090,75 -7346,59 +9236,75 @@@ msgstr "chyba pri vytv�ran� `%s': %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "chyba pri ��tan� `%s': %s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "nespr�vny certifik�t"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "nespr�vny certifik�t"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "nespr�vny certifik�t"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "nespr�vny certifik�t"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9166,226 -7406,155 +9312,199 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "nem�em sa pripoji� k `%s': %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "duplicita predvo�by %c%lu\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "POZN�MKA: k��� bol revokovan�"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "nem�em pou�i� pr�kaz stat na `%s': %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "nem�em sa pripoji� k `%s': %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Podporovan� algoritmy:\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
msgid "run without asking a user"
msgstr "Ukon�i� bez ulo�enia? "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, 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:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9399,91 -7568,72 +9518,91 @@@ msgstr "
"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
"mo�nost�)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "pou�itie: gpg [mo�nosti] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "riadok je pr�li� dlh�\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "chyba pri ��tan�: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
msgid "shutdown forced\n"
msgstr "nespracovan�"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9734,12 -7833,10 +9853,12 @@@ msgstr "vyh�ad�vam \"%s\" na HKP server
msgid "malloc failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9774,11 -7865,10 +9893,12 @@@ msgstr "chyba pri ��tan� `%s': %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr ""
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "k��� `%s' nebol n�jden�: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9926,72 -7986,61 +10046,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10248,11 -8237,9 +10373,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/sv.gmo
index 86a3654,0000000..55d2759
mode 100644,000000..100644
Binary files differ
diff --cc po/sv.po
index 93f5b88,a589184..88a0128
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2011-01-12 14:53+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@@ -93,7 -82,6 +93,7 @@@ msgstr "Ange ny lösenfras
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Kvalitet:"
@@@ -103,7 -91,6 +103,7 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@@ -112,7 -99,6 +112,7 @@@
"och specialtecken. Fråga din administratör om mer exakt information hur\n"
"man anger säkra lösenfraser."
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -120,61 -106,47 +120,61 @@@ msgstr "
"Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
"sessionen"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
"Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Lösenfras:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "stämmer inte överens - försök igen"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (försök %d av %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "PIN-koden är för lång"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Lösenfrasen är för lång"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "Ogiltiga tecken i PIN-kod"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "PIN-kod för kort"
# MPI står för Multiple Precision Integer (tror jag)
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "Felaktig PIN-kod"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Felaktig lösenfras"
@@@ -185,25 -156,11 +185,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -278,11 -222,9 +278,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "misslyckades med att skapa flöde från uttag: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "Mata in kortet med serienummer"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "Ta bort det aktuella kortet och mata in det med serienummer"
@@@ -442,41 -358,27 +442,41 @@@ msgstr "
"@Flaggor:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "kör i demonläge (bakgrund)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "kör i serverläge (förgrund)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "utförlig"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "var något tystare"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sh-liknande kommandoutdata"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "csh-liknande kommandoutdata"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FIL|läs inställningar från FIL"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "frigör inte från konsollen"
@@@ -560,11 -445,6 +560,11 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Rapportera fel till <@EMAIL@>.\n"
@@@ -588,152 -466,114 +588,151 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, 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:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan inte skapa uttag: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, 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:1750
++#: agent/gpg-agent.c:1735
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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "fel vid hämtning av nonce för uttaget\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, 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"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() misslyckades: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, 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:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 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:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fel vid läsning av nonce på fd %d: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "hanteraren 0x%lx för fd %d startad\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "hanteraren 0x%lx för fd %d avslutad\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, 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:2288
++#: agent/gpg-agent.c:2273
#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, 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:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kör i den här sessionen\n"
@@@ -751,8 -589,6 +750,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
"Underhåll av lösenordscache\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -761,9 -597,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:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -817,7 -642,6 +816,7 @@@ msgstr "avbruten\n
msgid "error while asking for the passphrase: %s\n"
msgstr "fel vid fråga efter lösenfrasen: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -1017,8 -807,6 +1016,8 @@@ msgstr "fel när ett rör skapades: %s\
msgid "error creating a stream for a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "fel vid grening av process: %s\n"
@@@ -1174,7 -930,6 +1173,7 @@@ msgstr "ingen körande gpg-agent - star
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "väntar %d sekunder för att agenten ska komma igång\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1196,7 -948,6 +1195,7 @@@ msgstr "ingen körande dirmngr - starta
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:666 common/asshelp.c:697
++#: common/asshelp.c:666
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1460,7 -1151,6 +1459,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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "slut på minne\n"
@@@ -1651,19 -1303,14 +1650,19 @@@ msgstr "misslyckades med att förmedla
msgid "Enter passphrase: "
msgstr "Ange lösenfrasen\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kort nr. %s identifierades\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "kan inte göra detta i satsläge\n"
@@@ -1675,155 -1320,116 +1674,155 @@@ msgstr "Detta kommando är endast tillg
msgid "Reset Code not or not anymore available\n"
msgstr "Återställningskoden är inte tillgänglig längre\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Vad väljer du? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[inte inställt]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "man"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "kvinna"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "ej angiven"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "inte tvingad"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "tvingad"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Fel: Tecknet \"<\" får inte användas.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Kortinnehavarens efternamn: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Kortinnehavarens förnamn: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "Url för att hämta publik nyckel: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "fel vid läsning av \"%s\": %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "fel vid skrivning till \"%s\": %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Inloggningsdata (kontonamn): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Privat DO-data: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Språkinställningar: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Fel: ogiltig längd på inställningssträngen\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Fel: ogiltigt svar.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "CA-fingeravtryck: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "nyckelåtgärden är inte möjlig: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "inte ett OpenPGP-kort"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Ersätt existerande nyckel? (j/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1839,59 -1445,47 +1838,59 @@@ msgstr "
" kontrollera dokumentationen för ditt kort för att se vilka storlekar\n"
" som tillåts.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för signaturnyckeln? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för krypteringsnyckeln? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för autentiseringsnyckeln? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "avrundade uppåt till %u bitar\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
"bitar\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "fel vid ändring av storlek för nyckel %d till %u bitar: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Ersätt existerande nycklar? (j/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1906,147 -1500,112 +1905,147 @@@ msgstr "
" PIN-kod = \"%s\" Admin PIN-kod = \"%s\"\n"
"Du bör ändra dem med kommandot --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Välj vilken typ av nyckel som ska genereras:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Signeringsnyckel\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Krypteringsnyckel\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsnyckel\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Ogiltigt val.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Välj var nyckeln ska sparas:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "läsning misslyckades: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Signera den? (j/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "avsluta denna meny"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "visa administratörskommandon"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "visa denna hjälp"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "lista allt tillgängligt data"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "ändra kortinnehavarens namn"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "ändra url för att hämta nyckel"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "hämta nyckel som anges i kortets url"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "ändra inloggningsnamnet"
# originalet borde ha ett value
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "ändra språkinställningarna"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "ändra kortinnehavarens kön"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "ändra ett CA-fingeravtryck"
# den låter skum
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "växla flagga för att tvinga signatur-PIN-kod"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "generera nya nycklar"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "meny för att ändra eller avblockera PIN-koden"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "validera PIN-koden och lista allt data"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "lås upp PIN-koden med en nollställningskod"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/kort> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "Kommandon endast för administratör\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Administrationskommandon tillåts\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Administrationskommandon tillåts inte\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Ogiltigt kommando (prova med \"help\")\n"
@@@ -2055,76 -1613,63 +2054,83 @@@ msgid "--output doesn't work for this c
msgstr "--output kan inte användas för detta kommando\n"
# se förra kommentaren
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan inte öppna \"%s\"\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "nyckeln \"%s\" hittades inte: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fel vid läsning av nyckelblock: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "nyckeln \"%s\" hittades inte: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "kan inte göra så i satsläge utan \"--yes\"\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Ta bort denna nyckel från nyckelringen? (j/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Detta är en hemlig nyckel! - verkligen ta bort den? (j/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "deleting secret %s failed: %s\n"
msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr ""
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Publik nyckel: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "misslyckades med att radera nyckelblock: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "raderat information om ägartillit\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "det finns en hemlig nyckel för denna publika nyckeln \"%s\"!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
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:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fel när lösenfras skapades: %s\n"
@@@ -2179,7 -1716,6 +2185,7 @@@ msgid "forcing symmetric cipher %s (%d
msgstr ""
"tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, 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"
@@@ -2269,277 -1789,231 +2275,298 @@@ msgstr "VARNING: kan inte ta bort tempf
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "VARNING: kunde inte ta bort temp-katalogen \"%s\": %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "exportera signaturer som är märkta som endast lokala"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "exportera spärrnycklar markerade som \"känslig\""
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "ta bort oanvändbara delar från nyckeln under exportering"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "ta bort så mycket som möjligt från nyckeln under exportering"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "export av hemliga nycklar tillåts inte\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: hoppade över: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "VARNING: ingenting exporterat\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[Användaridentiteten hittades inte]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "hämtade \"%s\" automatiskt via %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "Inget fingeravtryck"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "argument för flaggan \"%.50s\" saknas\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "skapa en signatur"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "skapa en klartextsignatur"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "skapa signatur i en separat fil"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "kryptera data"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
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:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "dekryptera data (standard)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "validera en signatur"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "lista nycklar"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "lista nycklar och signaturer"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "lista och kontrollera nyckelsignaturer"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "lista nycklar och fingeravtryck"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "lista hemliga nycklar"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "generera ett spärrcertifikat"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "ta bort nycklar från den publika nyckelringen"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "ta bort nycklar från den hemliga nyckelringen"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "ändra en lösenfras"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "exportera nycklar"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "exportera nycklar till en nyckelserver"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "importera nycklar från en nyckelserver"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "sök efter nycklar hos en nyckelserver"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "importera/slå samman nycklar"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "skriv ut kortstatus"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "ändra data på ett kort"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "ändra PIN-kod för ett kort"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "skriv ut kontrollsummor"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "kör i serverläge"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
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:502
++#: g10/gpg.c:513
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:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "använd \"ursprunglig text\"-läget"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|FIL|skriv utdata till FIL"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "gör inga ändringar"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "fråga innan överskrivning"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
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:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2547,7 -2021,6 +2574,7 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2567,14 -2040,12 +2594,14 @@@ msgstr "
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2589,7 -2060,6 +2616,7 @@@ msgstr "
"signera, kontrollera, kryptera eller dekryptera\n"
"standardåtgärden beror på inmatningsdata\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2597,84 -2067,69 +2624,84 @@@ msgstr "
"\n"
"Algoritmer som stöds:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Publik nyckel: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Kontrollsumma: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "användning: gpgsm [flaggor] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
# Vad betyder detta?
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2684,21 -2139,18 +2711,21 @@@ msgstr "
"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2709,507 -2161,458 +2736,579 @@@ msgstr "
"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "okänd konfigurationspost \"%s\"\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "visa foto-id under nyckellistning"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, 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:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "visa policy-url:er under signaturlistningar"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "visa alla notationer under signaturlistningar"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "visa IETF-standardnotationer under signaturlistningar"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "visa användarangivna notationer under signaturlistningar"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "visa giltighet för användaridentitet vid nyckellistningar "
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "visa nyckelringens namn i nyckellistningar"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "visa utgångsdatum under signaturlistningar"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "Tillgängliga nycklar:\n"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option `%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "okänd flagga \"%s\"\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command `%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "okänt kommando \"%s\"\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "flagga \"%.50s\" är tvetydig\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
+
++#: g10/gpg.c:2423
#, 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:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "OBS: %s är inte för normal användning!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, 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:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka url till nyckelserver\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ogiltiga importeringsflaggor\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "ogiltiga importflaggor\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ogiltiga exportflaggor\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "ogiltiga exportinställningar\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ogiltiga listflaggor\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "visa foto-id under signaturvalidering"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "visa policy-url:er under signaturvalidering"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "visa alla notationer under signaturvalidering"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "visa IETF-standardnotationer under signaturvalidering"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "visa användarangivna notationer under signaturvalidering"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "visa giltighet för användaridentitet vid signaturvalidering"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr "visa endast primär användaridentitet i signaturvalidering"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "validera signaturer med PKA-data"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "öka tillit på signaturer med giltigt PKA-data"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ogiltiga flaggor för validering\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "ogiltiga flaggor för validering\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, 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:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
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:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "vald komprimeringsalgoritm är ogiltig\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
# antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
# antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
# Hur djupt GnuPG ska leta i Web-of-trust.
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
# S2K har med krypteringen av hemliga nyckeln att göra
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "ogiltiga standardinställningar\n"
# Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "ogiltig inställning av personligt chiffer\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, 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/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [filnamn]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, 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:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnamn]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
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:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnamn]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
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:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnamn]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key användaridentitet"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key användaridentitet"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key användaridentitet [kommandon]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd <användaridentitet>"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sändning till nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "hämtning från nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "sökning på nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[filnamn]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande här ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|FIL|ta nycklarna från nyckelringen FIL "
# Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
# Kommandot är avsett att användas i "near online system".
# Krav från RIPE.
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation till denna FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3388,7 -2757,6 +3487,7 @@@ msgid "you can update your preferences
msgstr ""
"du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "nyckel %s: ingen användaridentitet\n"
@@@ -3399,7 -2766,6 +3498,7 @@@
msgid "key %s: %s\n"
msgstr "hoppade över \"%s\": %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3424,7 -2786,6 +3523,7 @@@ msgstr "nyckel %s: inga giltiga använd
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
@@@ -3434,264 -2794,227 +3533,279 @@@
msgid "key %s: new key - skipped\n"
msgstr "nyckel %s: ny nyckel - hoppade över\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "skriver till \"%s\"\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, 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:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nyckel %s: \"%s\" inte ändrad\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nyckel %s: hemlig nyckel importerades\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, 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:1663
++#: g10/import.c:1680
#, 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:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "import av hemliga nycklar tillåts inte\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, 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"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, 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:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nyckel %s: ogiltig undernyckelbindning\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nyckel %s: hoppade över undernyckel\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
@@@ -3720,62 -3039,54 +3834,68 @@@ msgstr "nyckelskåpet \"%s\" skapat\n
msgid "keyring '%s' created\n"
msgstr "%s: nyckelring skapad\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "nyckelblockresurs \"%s\": %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening `%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "fel vid öppnandet av \"%s\": %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[spärr]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[självsignatur]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 felaktig signatur\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d felaktiga signaturer\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signatur validerades inte eftersom nyckeln saknades\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signaturer validerades inte eftersom nycklar saknades\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 signatur validerades inte eftersom ett fel uppstod\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signaturer validerades inte eftersom fel uppstod\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 användaridentitet utan giltig självsignatur hittades\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d användaridentiteter utan giltiga självsignaturer hittades\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3786,17 -3097,14 +3906,17 @@@ msgstr "
"korrekt validera andra användares nycklar (genom att undersöka pass,\n"
"undersöka fingeravtryck från olika källor, etc.)\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Jag litar marginellt\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Jag litar fullständigt\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3806,46 -3114,39 +3926,51 @@@ msgstr "
"Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
"skapa tillitssignaturer åt dig.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Användaridentiteten \"%s\" är spärrad."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Vill du verkligen fortfarande signera den? (j/N)"
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Kan inte signera.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Användaridentiteten \"%s\" är inte självsignerad."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Användaridentiteten \"%s\" är signerbar. "
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Signera den? (j/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3854,11 -3155,9 +3979,11 @@@ msgstr "
"Självsignaturen på \"%s\"\n"
"är en signatur av PGP 2.x-typ.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3867,13 -3166,11 +3992,13 @@@ msgstr "
"Giltighetstiden för din nuvarande signatur på \"%s\"\n"
"har gått ut.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
"n) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3882,44 -3179,35 +4007,44 @@@ msgstr "
"Din nuvarande signatur på \"%s\"\n"
"är en lokal signatur.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Vill du ändra den till en fullständig exporterbar signatur? (j/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" var redan signerad av nyckeln %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Vill du verkligen signera den igen ändå?(j/N)"
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Det finns inget att signera med nyckeln %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Giltighetstiden för denna nyckel har gått ut!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3928,33 -3216,27 +4053,33 @@@ msgstr "
"Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
"personen som nämns ovan? Om du inte vet vad du ska svara, svara \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jag vill inte svara.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Jag har inte kontrollerat alls.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jag har gjort viss kontroll.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Jag har gjort en noggrann kontroll.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Ditt val? (skriv \"?\" för mer information): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3963,234 -3245,179 +4088,234 @@@ msgstr "
"Är du verkligen säker på att du vill signera denna nyckel\n"
"med din nyckel \"%s\" (%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Detta kommer att bli en självsignatur.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Verkligen signera? (j/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "signeringen misslyckades: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
"att ändra.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "fel när lösenfras skapades: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "spara och avsluta"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "visa nyckelns fingeravtryck"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Ange nyckelhashen: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "lista nycklar och användaridentiteter"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "välj användaridentiteten N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "välj undernyckel N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "kontrollera signaturer"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"signera valda användaridentiteter [* se nedan för relaterade kommandon]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "signera valda användaridentiteter lokalt"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "signera valda användaridentiteter med en tillitssignatur"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "lägg till en användaridentitet"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "lägg till ett foto-id"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "ta bort valda användaridentiteter"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "lägg till en undernyckel"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "lägg till en nyckel till ett smartkort"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "flytta en nyckel till ett smartkort"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "flytta en nyckelkopia till ett smartkort"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "ta bort valda undernycklar"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "lägg till en spärrnyckel"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "ta bort signaturer från valda användaridentiteter"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "flagga vald användaridentitet som primär"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "lista inställningar (expertläge)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "lista inställningar (utförligt)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "ställ in inställningslista för valda användaridentiteter"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"ställ in url till föredragen nyckelserver för valda användaridentiteter"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "ställ in en notation för valda användaridentiteter"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "ändra lösenfrasen"
# originalet borde ha ett value
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "ändra ägartillitsvärdet"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "spärra signaturer på valda användaridentiteter"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "spärra valda användaridentiteter"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "spärra nyckel eller valda undernycklar"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "aktivera nyckel"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "inaktivera nyckel"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "visa valda foto-id:n"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
"signaturer från nyckeln"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
"nyckeln"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Den hemliga nyckeln finns tillgänglig.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4210,260 -3437,204 +4335,261 @@@ msgstr "
"signaturer\n"
" (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Nyckeln är spärrad."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Verkligen signera alla användaridentiteter? (j/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Verkligen signera alla användaridentiteter? (j/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Okänd signaturtyp \"%s\"\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Du måste välja åtminstone en användaridentitet.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Verkligen flytta den primära nyckeln? (j/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Du måste välja exakt en nyckel.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "Kommandot förväntar ett filnamnsargument\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "Kan inte öppna \"%s\": %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Du måste välja åtminstone en nyckel.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Verkligen spärra denna användaridentitet? (j/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
"tillhandahåller\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Ställ in inställningslista till:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
"(j/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Spara ändringar? (j/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Avsluta utan att spara? (j/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "uppdateringen misslyckades: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ogiltigt fingeravtryck"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "misslyckades med att få fingeravtrycket\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Ingen sådan användaridentitet.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "Det finns inget att signera med nyckeln %s\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Sammandrag: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Funktioner: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Nyckelserver no-modify"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Föredragen nyckelserver: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Notationer: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
"Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
"typ.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Följande nyckel blev spärrad den %s av %s nyckel %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(känsligt)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "skapat: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "spärrad: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "utgånget: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "går ut: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "kortnummer: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "tillit: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "giltighet: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Denna nyckel har stängts av"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4471,17 -3642,12 +4597,17 @@@ msgstr "
"Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
"såvida inte du startar om programmet.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "spärrad"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "utgånget"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4490,17 -3656,14 +4616,17 @@@ msgstr "
"Detta kommando kan göra att en annan användaridentitet antas\n"
"vara den primära identiteten.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4509,79 -3672,62 +4635,79 @@@ msgstr "
"VARNING: Detta är en nyckel av PGP2-typ. Om du lägger till ett foto-id kan\n"
" vissa versioner av PGP avvisa denna nyckel.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Vill du radera denna okända signatur? (j/N/a)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Verkligen ta bort denna självsignatur? (j/N)"
# skulle lika gärna kunna heta 1 signatur va?
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Raderade %d signatur.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Raderade %d signaturer.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Ingenting raderat.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "ogiltigt"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Användaridentitet \"%s\": redan minimerad\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Användaridentitet \"%s\": redan rensad\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4591,191 -3737,162 +4717,204 @@@ msgstr "
"denna\n"
" nyckel inte användas i vissa versioner av PGP.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Ange användaridentiteten för spärrnyckeln: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
# designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Välj som mest en undernyckel.\n"
+ # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Ändrar utgångstid för en undernyckel.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
# Vad betyder det?
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Välj endast en användaridentitet.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Ange din föredragna nyckelserver-url: "
# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Är du säker på att du vill ersätta det? (j/N) "
# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Är du säker på att du vill ta bort det? (j/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Ange notationen: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "Fortsätt? (j/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen användaridentitet med indexet %d\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen användaridentitet med hashen %s\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Ingen undernyckel med indexet %d\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen undernyckel med indexet %d\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "användaridentitet: \"%s\"\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "signerat av din nyckel %s den %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (icke exporterbar)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denna signatur gick ut den %s.\n"
# nyckel? signatur?
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "Inte signerad av dig.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (inte spärrbar)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "spärrad av din nyckel %s den %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Du är på väg att spärra dessa signaturer:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "ingen hemlig nyckel\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "användaridentiteten \"%s\" är redan spärrad\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
"framtiden\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Nyckeln %s är redan spärrad.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undernyckeln %s är redan spärrad.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
@@@ -4816,14 -3925,10 +4955,14 @@@ msgstr "skriver självsignatur\n
msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
@@@ -5130,41 -4186,36 +5269,46 @@@ msgstr "
msgid "Real name: "
msgstr "Namn: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Ogiltigt tecken i namnet\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Namnet får inte börja med en siffra\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "E-postadress: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "E-postadressen är ogiltig\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Ogiltigt tecken i kommentaren\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Du använder teckentabellen \"%s\"\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5175,7 -4226,6 +5319,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Ange inte e-postadressen som namn eller kommentar\n"
@@@ -5191,36 -4241,29 +5335,36 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Rätta först felet\n"
# fel kapitalisering i originalet?
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5228,7 -4271,6 +5372,7 @@@ msgstr "
"Du behöver en lösenfras för att skydda din hemliga nyckel\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@@ -5236,16 -4278,13 +5380,16 @@@ msgstr "
"Ange en lösenfras för att skydda säkerhetskopian av den nya "
"krypteringsnyckeln."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "lösenfrasen repeterades inte korrekt; försök igen."
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5257,7 -4296,6 +5401,7 @@@ msgstr "
"om du använder detta program med flaggan \"--edit-key\".\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5269,12 -4307,10 +5413,12 @@@ msgstr "
"hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
"en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5282,60 -4318,49 +5426,60 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "nyckeln finns redan\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Vill du använda nyckeln ändå? (j/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "genererar ny nyckel\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbröts.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "skriver den publika nyckeln till \"%s\"\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
# Flagga.. inte kommando
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5345,7 -4370,6 +5489,7 @@@ msgstr "
"syfte.\n"
# c-format behövs inte i singularis
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5353,7 -4377,6 +5497,7 @@@ msgstr "
"nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5361,245 -4384,193 +5505,245 @@@ msgstr "
"nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Verkligen skapa? (j/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "aldrig"
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Viktig signaturpolicy: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Signaturpolicy: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Föredragen kritisk nyckelserver: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritisk signaturnotation: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Signaturnotation: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 felaktig signatur\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d felaktiga signaturer\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Nyckelring"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "hoppade över \"%s\": %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Undernyckelns fingeravtryck:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Undernyckelns fingeravtryck:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr "Nyckelns fingeravtryck ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " Kortets serienr ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "mellanlagrar nyckelringen \"%s\"\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: nyckelring skapad\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "inkludera spärrade nycklar i sökresultatet"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "inkludera undernycklar vid sökning efter nyckel-id"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "hämta automatiskt nycklar vid validering av signaturer"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "respektera PKA-posten inställd på en nyckel när nycklar hämtas"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "inaktiverad"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "uppdaterar 1 nyckel från %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "uppdaterar %d nycklar från %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "nyckeln hittades inte på nyckelservern\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "begär nyckeln %s från %s-servern %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "begär nyckeln %s från %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "skickar nyckeln %s till %s-servern %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "skickar nyckeln %s till %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "begär nyckeln %s från %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
@@@ -5634,7 -4599,6 +5778,7 @@@ msgstr "Data krypterat med publik nycke
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
@@@ -5685,265 -4640,214 +5829,266 @@@ msgstr "dekrypteringen lyckades\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "tömde mellanlagrad lösenfras med ID: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekrypteringen misslyckades: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "ursprungligt filnamn=\"%.*s\"\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "VARNING: multipla klartexter har påträffats\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"fristående spärrcertifikat - använd \"gpg --import\" för\n"
"att verkställa\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "ingen signatur hittades\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FELAKTIG signatur från \"%s\""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Utgången signatur från \"%s\""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekt signatur från \"%s\""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "signaturvalidering utlämnad\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "kan inte hantera detta tvetydliga signaturdata\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur gjord %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " med %s-nyckeln %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
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:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[osäkert]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " även känd som \"%s\""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Giltighetstiden för signaturen har upphört %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Giltighetstiden för signaturen går ut %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "binär"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "textläge"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "okänd"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritm: %s"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan inte kontrollera signaturen: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "detta är inte någon signatur i en separat fil\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
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:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "fristående signatur av klassen 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "signatur av den gamla (PGP 2.x) typen\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
#| msgid "fstat of `%s' failed in %s: %s\n"
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "fstat för \"%s\" misslyckades i %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) misslyckades i %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "VARNING: använder experimentella algoritmen %s för publik nyckel\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "VARNING: Elgamal-nycklar för kryptering/signering är föråldrade\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s signatur, sammandragsalgoritm %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Använd \"%s%s\" istället\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Okomprimerad"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "okomprimerad|ingen"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "detta meddelande kanske inte kan användas av %s\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "tvetydlig flagga \"%s\"\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "okänd flagga \"%s\"\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type `%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Okänd signaturtyp \"%s\"\n"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6146,33 -5017,26 +6291,33 @@@ msgstr "Är detta foto korrekt (j/N/a)
msgid "unable to display photo ID!\n"
msgstr "kan inte visa foto-id!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Ingen anledning har angivits"
# tveksam översättning. funderar på "ersatt av något bättre" men det
# känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Nyckeln är åsidosatt"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Nyckeln har blivit komprometterad"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Nyckeln används inte längre"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Användaridentiteten är inte längre giltig"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "anledning för spärrning: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "spärrningskommentar: "
@@@ -6187,53 -5051,42 +6332,53 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImHhAsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Inget tillitsvärde tilldelat till:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " även känd som \"%s\"\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"Hur mycket litar du på att nyckeln faktiskt tillhör den angivna användaren?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Jag vet inte eller kan inte säga något\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Jag litar INTE\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Jag litar förbehållslöst\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " h = gå tillbaka till huvudmenyn\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = hoppa över denna nyckel\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " a = avsluta\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6242,40 -5095,32 +6387,40 @@@ msgstr "
"Minimum tillitsnivå för denna nyckel är: %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Vad väljer du? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Vill du verkligen ge denna nyckel förbehållslöst förtroende? (j/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: Det finns inget som säger att nyckeln tillhör den angivna användaren\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: Det finns viss information om att nyckeln tillhör den angivna "
"användaren\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Den här nyckel tillhör antagligen den namngivna användaren\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Denna nyckel tillhör oss\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6285,116 -5130,91 +6430,116 @@@ msgstr "
"användaridentiteten. Om du *verkligen* vet vad du gör, kan du svara\n"
"ja på nästkommande fråga.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "Vill du använda nyckeln ändå? (j/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " Detta kan betyda att signaturen är förfalskad.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Obs: Denna nyckel har stängts av.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, 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:588
++#: g10/pkclist.c:589
#, 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:600
++#: g10/pkclist.c:601
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:608
++#: g10/pkclist.c:609
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:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen är sannolikt en FÖRFALSKNING.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppade över: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
# överhoppad?
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: hoppades över: publik nyckel finns redan\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Nuvarande mottagare:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6402,24 -5222,19 +6547,24 @@@ msgstr "
"\n"
"Ange användaridentiteten. Avsluta med en tom rad: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Ingen sådan användaridentitet.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Den publika nyckeln är inaktiverad.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "hoppade över: publik nyckel redan angiven\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "okänd standardmottagare \"%s\"\n"
@@@ -6427,56 -5242,44 +6572,56 @@@
# plural av adressee
# dvs. den som meddelandet är adresserat till.
# Åtskillnad görs mellan adressee och receiver.
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "inga giltiga adressater\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, 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:1566
++#: g10/pkclist.c:1568
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "Fel när \"%s\" skapades: %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Signatur i en separat fil.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Ange namnet på datafilen: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "läser från standard in ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "ingen signerad data\n"
# se förra kommentaren
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "kan inte öppna signerat data \"%s\"\n"
# se förra kommentaren
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan inte öppna signerad data fd=%d: %s\n"
@@@ -6518,8 -5314,6 +6663,8 @@@ msgid "Note: key has been revoked
msgstr "OBSERVERA: nyckeln har spärrats"
# Vad?
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet misslyckades: %s\n"
@@@ -6529,15 -5322,17 +6674,21 @@@
msgid "key %s has no user IDs\n"
msgstr "nyckeln %s har inga användaridentiteter\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Kommer att spärras av:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Detta är en känslig spärrnyckel)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Den hemliga nyckeln finns tillgänglig.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
@@@ -6546,32 -5341,26 +6697,32 @@@
# -do-not-force översatt med:
# genomdriv inte
# I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "utdata med ett ascii-skal genomdrivet.\n"
# Vad menas???
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet misslyckades: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Spärrcertifikat skapat.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "inga spärrnycklar hittades för \"%s\"\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6579,18 -5368,27 +6730,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6608,33 -5406,26 +6773,33 @@@ msgstr "
"media blir oläsligt. Men se upp: Utskriftsfunktionen på\n"
"din dator kan spara data så att det blir åtkomligt för andra!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Välj anledning till varför nyckeln spärras:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Avbryt"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Troligen vill du välja %d här)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Ange en valfri beskrivning; avsluta med en tom rad:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Anledning för spärrning: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Ingen beskrivning angiven)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Är detta OK? (j/N) "
@@@ -6661,40 -5448,33 +6826,40 @@@ msgstr "%s-nyckeln använder en osäke
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "DSA-nyckeln %s kräver en hash med %u bitar eller större\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
# Vad betyder det?
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "se %s för mer information\n"
# cross-certification?
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "VARNING signeringsundernyckel %s har en ogiltig korscertifiering\n"
# behövs verkligen c-format här?
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "den publika nyckeln %s är %lu sekunder nyare än signaturen\n"
# c-format behövs inte i singularis
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6702,7 -5482,6 +6867,7 @@@ msgstr "
"nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
"klocka)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6710,30 -5489,25 +6875,30 @@@ msgstr "
"nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller "
"felinställd klocka)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "OBSERVERA: signaturnyckeln %s har spärrats\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
@@@ -6779,33 -5547,27 +6944,33 @@@ msgstr "
msgid "signing:"
msgstr "signerar:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "krypteringen %s kommer att användas\n"
# Slumptalsgenerator: Random Number Generator
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"nyckeln är inte markerad som osäker - det går inte att använda den med "
"fejkad slumptalsgenerator!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "hoppade över \"%s\": förekommer flera gånger\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "hoppade över: hemlig nyckel finns redan\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@@ -6853,7 -5607,6 +7018,7 @@@ msgstr "fel vid sökning av tillitsvär
msgid "read error in '%s': %s\n"
msgstr "läsfel i \"%s\": %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
@@@ -6885,7 -5633,6 +7050,7 @@@ msgstr "tillitsdatabasposten %lu: skriv
msgid "trustdb transaction too large\n"
msgstr "tillitsdatabastransaktion för stor\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7002,130 -5726,106 +7167,130 @@@ 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/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "\"%s\" är inget giltigt långt nyckel-id\n"
# trusted??
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "nyckel %s: accepterad som betrodd nyckel\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "nyckeln %s förekommer fler än en gång i tillitsdatabasen\n"
# nyckeln?
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "nyckel %s: ingen publik nyckel för pålitlig nyckel - hoppades över\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "nyckeln %s är markerad med förbehållslöst förtroende\n"
# req står för request
# kollat med Werner. Per
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "Du kan försöka att skapa tillitsdatabasen igen med dessa kommandon:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "Referera till handboken om detta inte fungerar för dig\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "använder tillitsmodellen %s\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
#| msgid "no need for a trustdb check with `%s' trust model\n"
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr ""
"det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
#| msgid "no need for a trustdb update with `%s' trust model\n"
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr ""
"det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "publika nyckeln %s hittades inte: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
# originalet borde ha ett value
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "kontrollerar tillitsdatabasen\n"
# Vad är detta!?
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "%d marginal(er) behövs, %d fullständig(a) behövs, tillitsmodell %s\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
"djup: %d giltig: %3d signerad: %3d tillit: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7379,11 -6030,9 +7544,11 @@@ msgstr "PIN-kod för CHV%d är för kor
msgid "verify CHV%d failed: %s\n"
msgstr "validering av CHV%d misslyckades: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "fel vid hämtning av CHV-status från kort\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "kortet är låst permanent!\n"
@@@ -7518,14 -6139,12 +7683,14 @@@ msgstr "kortet har inte stöd för samm
msgid "signatures created so far: %lu\n"
msgstr "signaturer skapade hittills: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"validering av Admin PIN-kod är för närvarande förbjudet genom detta "
"kommando\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@@ -7547,7 -6163,6 +7712,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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
@@@ -7614,12 -6217,10 +7779,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "hanterare för fd %d startad\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "hanterare för fd %d avslutad\n"
@@@ -8063,7 -6572,6 +8228,7 @@@ msgstr "rad %d: fel vid hämtning av ny
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "rad %d: nyckelgenerering misslyckades: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8680,7 -7068,6 +8845,7 @@@ msgstr "Inkluderade certifikat
msgid " runtime cached certificates: %u\n"
msgstr "antal matchande certifikat: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -8692,8 -7078,6 +8857,8 @@@ msgstr " (certifikat skapat
msgid "certificate cached\n"
msgstr "certifikatet är korrekt\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -8765,7 -7138,6 +8930,7 @@@ msgstr "mottagande rad misslyckades: %s
msgid "not removing file '%s'\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing cache file: %s\n"
@@@ -9010,241 -7338,198 +9175,241 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "fel vid hämtning av lagrade flaggor: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr ""
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
#| msgid "iconv_open failed: %s\n"
msgid "converting S-expression failed: %s\n"
msgstr "iconv_open misslyckades: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "creating S-expression failed: %s\n"
msgstr "mottagande rad misslyckades: %s\n"
# Vad?
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet misslyckades: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
#| msgid "error getting serial number of card: %s\n"
msgid "error getting update times of CRL: %s\n"
msgstr "fel när serienumret hämtades från kortet: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting CRL item: %s\n"
msgstr "fel vid hämtning av ny PIN-kod: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error inserting item into temporary cache file: %s\n"
msgstr "fel vid skrivning till temporärfil: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
#| msgid "no issuer found in certificate"
msgid "no CRL issuer found in CRL: %s\n"
msgstr "ingen utfärdare hittades i certifikatet"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "signaturvalidering utlämnad\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
#| msgid "error reading list of trusted root certificates\n"
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "fel vid inläsning av betrodda rotcertifikat\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "ksba_crl_new failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "läsning misslyckades: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "removed stale temporary cache file '%s'\n"
msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating temporary cache file '%s': %s\n"
msgstr "fel när temporärfil skapades: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "misslyckades med att uppdatera hemligheten: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "fel vid skrivning till temporärfil: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error closing temporary cache file '%s': %s\n"
msgstr "fel när temporärfil skapades: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
#| msgid "error reading input: %s\n"
msgid "error reading CRL extensions: %s\n"
msgstr "fel vid läsning av indata: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "creating cache file '%s'\n"
msgstr "fel när ett rör skapades: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid notation data found\n"
msgid " WARNING: invalid cache record length\n"
msgstr "VARNING: ogiltig notationsdata hittades\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
#| msgid "error reading the card: %s\n"
msgid "problem reading cache record: %s\n"
msgstr "fel vid läsning av kortet: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
#| msgid "problem re-searching certificate: %s\n"
msgid "problem reading cache key: %s\n"
msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
#| msgid "error reading nonce on fd %d: %s\n"
msgid "error reading cache entry from db: %s\n"
msgstr "fel vid läsning av nonce på fd %d: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "crl_fetch via DP failed: %s\n"
msgstr "läsning misslyckades: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "kontroll mot tillitslistan misslyckades: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9294,84 -7569,68 +9459,84 @@@ msgstr "fel vid hämtning av \"%s\" vi
msgid "error retrieving '%s': http status %u\n"
msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
#| msgid "certificate `%s' not found: %s\n"
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "certifikatet \"%s\" hittades inte: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
#| msgid "certificate `%s' not found: %s\n"
msgid "certificate search not possible due to disabled %s\n"
msgstr "certifikatet \"%s\" hittades inte: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
#| msgid " (certificate created at "
msgid "add a certificate to the cache"
msgstr " (certifikat skapat "
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
#| msgid "Included certificates"
msgid "validate a certificate"
msgstr "Inkluderade certifikat"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
#| msgid "Included certificates"
msgid "lookup a certificate"
msgstr "Inkluderade certifikat"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
#| msgid "Included certificates"
msgid "lookup only locally stored certificates"
msgstr "Inkluderade certifikat"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "load a CRL into the dirmngr"
msgstr "skicka ett kommando till dirmngr"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
#| msgid "export certificates"
msgid "expect certificates in PEM format"
msgstr "exportera certifikat"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "Ange användaridentiteten för spärrnyckeln: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9379,249 -7638,174 +9544,218 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error reading certificate from stdin: %s\n"
msgstr "fel vid lagring av certifikat: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
#| msgid "error reading from %s: %s\n"
msgid "error reading certificate from '%s': %s\n"
msgstr "fel vid läsning från %s: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "kan inte ansluta till \"%s\": %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "uppdateringen misslyckades: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "loading CRL '%s' failed: %s\n"
msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "validation of certificate failed: %s\n"
msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "certifikatet är korrekt\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
#| msgid "certificate has been revoked"
msgid "certificate has been revoked\n"
msgstr "certifikatet har spärrats"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "certificate check failed: %s\n"
msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, 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/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- #, fuzzy
- #| msgid "no running dirmngr - starting `%s'\n"
- msgid "no running dirmngr - starting one\n"
- msgstr "ingen körande dirmngr - startar \"%s\"\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- #| msgid "malformed DIRMNGR_INFO environment variable\n"
- msgid "malformed %s environment variable\n"
- msgstr "miljövariabeln DIRMNGR_INFO är felformaterad\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "dirmngr-protokoll version %d stöds inte\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "kan inte ansluta till \"%s\": %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "algoritmen stöds inte: %s"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: 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:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, 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:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "skicka ett kommando till dirmngr"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|FIL|skriv serverlägesloggar till FIL"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Avsluta utan att spara? (j/N) "
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, 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:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 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:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL| använd nyckelservern på URL"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ 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:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9634,13 -7818,11 +9768,13 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, 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:352
++#: dirmngr/dirmngr.c:355
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -9652,88 -7834,71 +9786,88 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, 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:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "användning: gpgsm [flaggor] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, 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:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, 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:1582
++#: dirmngr/dirmngr.c:1591
#, 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:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "ogiltigt fingeravtryck"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, 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:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "inte tvingad"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10004,12 -8118,10 +10138,12 @@@ msgstr "skickar nyckeln %s till %s-serv
msgid "malloc failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -10047,11 -8153,11 +10181,13 @@@ msgstr "fel vid läsning från %s: %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ #| msgid "certificate `%s' not found: %s\n"
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "certifikatet \"%s\" hittades inte: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -10218,80 -8294,70 +10354,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "sändande rad misslyckades: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "sändande rad misslyckades: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, 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:2304
++#: dirmngr/server.c:2409
+ #, 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:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10561,13 -8567,11 +10703,13 @@@ msgstr "Flaggor som kontrollerar format
msgid "Options controlling the interactivity and enforcement"
msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
+#: tools/gpgconf-comp.c:911
#, fuzzy
#| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr "Flaggor som kontrollerar säkerheten"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "Konfiguration för HTTP-servrar"
diff --cc po/tr.gmo
index 8e1cbbc,0000000..93ea095
mode 100644,000000..100644
Binary files differ
diff --cc po/tr.po
index de9b1fe,7246154..568878c
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2015-02-11 19:18+0100\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun at belgeler.gen.tr>\n"
"Language-Team: Turkish\n"
@@@ -71,7 -60,6 +71,7 @@@ msgstr "Yeni anahtar parolasını girin
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Kalite:"
@@@ -81,11 -69,9 +81,11 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -93,7 -79,6 +93,7 @@@ msgstr "
"Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
"olabilecek"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -101,53 -86,40 +101,53 @@@ msgstr "
"Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
"kilitsiz olabilecek"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Anahtar Parolası:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "aynı değiller - tekrar deneyin"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (%d/%d dene)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "PIN çok uzun"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Anahtar Parolası çok uzun"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "PIN içinde geçersiz karakterler var"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "PIN çok kısa"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "PIN hatalı"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Anahtar Parolası hatalı"
@@@ -156,25 -127,11 +156,25 @@@
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:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -249,11 -193,9 +249,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "sokette akım oluşturulamadı: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -412,41 -328,27 +412,41 @@@ msgstr "
"@Seçenekler:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "artalan süreci olarak çalışır"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "sunucu olarak (önalanda) çalışır"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ayrıntılı"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "biraz daha sessiz olur"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sh tarzı komut çıktısı"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "csh tarzı komut çıktısı"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "konsoldan kopulmaz"
@@@ -529,11 -414,6 +529,11 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 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 <"
@@@ -556,151 -434,113 +556,150 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, 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:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, 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:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, 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:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "soket oluşturulamıyor: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, 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:1750
++#: agent/gpg-agent.c:1735
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:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "soket için tuz alınırken hata\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, 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:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "soket dinleme başarısız: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
msgstr "`%s' soketi dinlemede\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 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:1852
++#: agent/gpg-agent.c:1837
#, 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:1856
++#: agent/gpg-agent.c:1841
#, 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:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, 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:2288
++#: agent/gpg-agent.c:2273
#, 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:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, 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:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
@@@ -717,8 -555,6 +716,8 @@@ msgstr "
"Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
"Parola arabelleği bakımcısı\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -726,9 -562,6 +725,9 @@@ msgstr "
"@Komutlar:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -784,7 -609,6 +783,7 @@@ msgstr "iptal edildi\n
msgid "error while asking for the passphrase: %s\n"
msgstr "anahtar parolası sorulurken hata: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -983,8 -773,6 +982,8 @@@ msgstr "boru oluşturulurken hata: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "süreç çatallanırken hata: %s\n"
@@@ -1138,7 -894,6 +1137,7 @@@ msgstr "çalışan gpg-agent yok - bir
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1159,7 -911,6 +1158,7 @@@ msgstr "çalışan dirmngr yok - `%s' b
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1431,7 -1122,6 +1430,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:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "nüve dışında\n"
@@@ -1617,19 -1269,14 +1616,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "Anahtar parolasını giriniz\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "%s numaralı OpenPGP kartı saptandı\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "bu önceden betik kipinde yapılamaz\n"
@@@ -1641,210 -1286,159 +1640,210 @@@ msgstr "Bu komut sadece 2. sürüm kart
msgid "Reset Code not or not anymore available\n"
msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Seçiminiz? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[belirtilmedi]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "erkek"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "dişi"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "belirtilmemiş"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "zorlanmadı"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "zorlandı"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Hata: Çift boşluğa izin verilmez.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Kart sahibinin soyadı: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Kart sahibinin adı: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "genel anahtarın alınacağı URL: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "yeterli bellek ayrılırken hata: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "\"%s\" okunurken hata: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "`%s' yazılırken hata: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Oturum açma verisi (hesap adı): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Özel DO verisi: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Dil tercihleri: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Hata: yanıt geçersiz.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "CA parmak izi: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Hata: biçimli parmakizi geçersiz\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "anahtar işlemi mümkün değil: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "bir OpenPGP kartı değil"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u bite yuvarlandı\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "soket `%s'e bağlanırken hata: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1859,144 -1453,109 +1858,144 @@@ msgstr "
" PIN = `%s' Admin PIN = `%s'\n"
"Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) İmzalama anahtarı\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Şifreleme anahtarı\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Kimlik kanıtlama anahtarı\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Seçim geçersiz.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "read başarısız: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "%s kipindeyken bu komut kullanılamaz.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "İmzalayacak mısınız? (e/H veya y/N) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "bu menüden çık"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "yönetici komutlarını gösterir"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "bunu gösterir"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "tüm kullanılabilir veriyi listeler"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "kart sahibinin ismini değiştirir"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "anahtarın alınacağı URL değiştirilir"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "kart URL'sinde belirtilmiş anahtarı alır"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "oturum açma ismini değiştirir"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "dil tercihlerini değiştirir"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "kart sahibinin cinsiyetini değiştirir"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "bir CA parmakizini değiştirir"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "imza zorlama PIN'i bayrağını değiştirir"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "yeni anahtarlar üretir"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "PIN'i değiştirme veya engelleme menüsü"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "PIN'i doğrular ve tüm veriyi listeler"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "Yöneticiye özel komut\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Yönetici komutlarına izin verilir\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Yönetici komutlarına izin verilmez\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
@@@ -2004,76 -1562,63 +2003,83 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output seçeneği bu komutla çalışmaz\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "`%s' açılamadı\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "anahtar \"%s\" yok: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "anahtar bloğu okunurken hata: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "anahtar \"%s\" yok: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(anahtarı parmak izi ile belirtmedikçe)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "betik kipinde \"--yes\" olmaksızın bu yapılamaz\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Bu anahtar, anahtar zincirinden silinsin mi? (e/H ya da y/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? (e/H veya y/N)"
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "deleting secret %s failed: %s\n"
msgstr "\"%s\" sertifikası silinemedi: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr ""
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "GenAnah: "
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "anahtar bloğu silinemedi: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "sahibinin güvencesi bilgisi temizlendi\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@@ -2128,7 -1665,6 +2134,7 @@@ msgid "forcing symmetric cipher %s (%d
msgstr ""
"alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
@@@ -2215,277 -1735,231 +2221,298 @@@ msgstr "UYARI: geçici dosya silinemiyo
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "sadece-yerel olarak imli imzalar ihraç edilir"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
"öznitelik kullanıcı kimliklerini (genellikle foto kimliklerini) ihraç eder"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "\"hassas\" olarak imli yürürlükten kaldırma anahtarlarını ihraç eder"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "ihraç sırasında anahtardan kullanışsız parçalar kaldırılır"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "ihraç sırasında anahtardan mümkün olduğunca çok şey kaldırılır"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "gizli anahtarların ihracına izin verilmez\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: atlandı: %s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[Kullanıcı kimliği yok]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "`%s' %s üzerinden özdevinimli olarak alındı\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "`%s' %s üzerinden alınırken hata: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "Parmak izi yok"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "gizli anahtar \"%s\" yok: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "bir imza yapar"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "açıkça okunabilen bir imza yapar"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "veriyi şifreler"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik şifre ile şifreler"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "bir imzayı doğrular"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "anahtarları listeler"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "anahtarları ve imzaları listeler"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "anahtar imzalarını listeler ve sınar"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "bir yürürlükten kaldırma sertifikası üretir"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "anahtarları genel anahtar zincirinden siler"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "anahtarları gizli anahtar zincirinden siler"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "bir anahtarı düzenler ve imzalar"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "anahtar parolası değiştirir"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "anahtarları gönderir"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "anahtarları bir anahtar sunucusundan indirir"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "bir anahtar sunucusunda anahtarları arar"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan günceller"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "anahtarları indirir/katıştırır"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "kart durumunu basar"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "kart üzerindeki veriyi değiştirir"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "bir kartın PIN'ini değiştirir"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "güvence veritabanını günceller"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "ileti özetlerini gösterir"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "sunucu kipinde çalışır"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
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:502
++#: g10/gpg.c:513
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:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|DOSYA|çıktı DOSYAya yazılır"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "üzerine yazmadan önce sorar"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "kesin OpenPGP davranışı etkin olur"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2493,7 -1967,6 +2520,7 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2513,13 -1986,11 +2540,13 @@@ msgstr "
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, 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:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2534,7 -2005,6 +2561,7 @@@ msgstr "
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2542,81 -2012,66 +2569,81 @@@ msgstr "
"\n"
"Desteklenen algoritmalar:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "GenAnah: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Şifre: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Sıkıştırma: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "kullanımı: gpgsm [seçenekler] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2624,19 -2079,16 +2651,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:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2645,501 -2097,451 +2672,572 @@@ 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:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, 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:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, 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:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
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:1863
++#: g10/gpg.c:1879
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:1865
++#: g10/gpg.c:1881
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:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
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:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "anahtarı iptal eder"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option `%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "`%s' seçeneği bilinmiyor\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command `%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "komut `%s' bilinmiyor\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "\"%.50s\" seçeneği belirsiz\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
+
++#: g10/gpg.c:2423
#, 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:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "BİLGİ: %s normal kullanım için değil!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, 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:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: liste seçenekleri geçersiz\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
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:2927
++#: g10/gpg.c:3286
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:2929
++#: g10/gpg.c:3288
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:2931
++#: g10/gpg.c:3290
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:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "imzaları PKA verisi ile doğrular"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
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:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, 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:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özet algoritması geçersiz\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "kişisel özet tercihleri geçersiz\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, 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:3607
++#: g10/gpg.c:3978
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:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, 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/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [dosyaismi]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, 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:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [dosyaismi]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [dosyaismi]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
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:3708
++#: g10/gpg.c:4110
#, 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:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [dosyaismi]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
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:3768
++#: g10/gpg.c:4170
#, 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:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [DOSYA]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [dosyaismi]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key kullanıcı-kimliği"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key kullanıcı-kimliği"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kullanıcı-kimliği [komutlar]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key kullanıcı-kimliği"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, 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:4041
++#: g10/gpg.c:4448
#, 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:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "anahtar sunucusunda arama başarısız: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, 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:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[dosyaismi]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|DOSYA|anahtarlar DOSYA anahtar zincirinden alınır"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|durum bilgisini bu FD'ye yazar"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3321,7 -2689,6 +3419,7 @@@ msgid "you can update your preferences
msgstr ""
"tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "anahtar %s: kullanıcı kimliği yok\n"
@@@ -3332,7 -2698,6 +3430,7 @@@
msgid "key %s: %s\n"
msgstr "\"%s\" atlandı: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3355,7 -2716,6 +3453,7 @@@ msgstr "anahtar %s: geçerli kullanıc�
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:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "anahtar %s: genel anahtar yok: %s\n"
@@@ -3365,267 -2724,230 +3463,282 @@@
msgid "key %s: new key - skipped\n"
msgstr "anahtar %s: yeni anahtar - atlandı\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "\"%s\"e yazıyor\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, 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:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, 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:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, 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:1194
++#: g10/import.c:1203
#, 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:1197
++#: g10/import.c:1206
#, 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:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "anahtar %s: \"%s\" %d yeni imza\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, 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:1221
++#: g10/import.c:1230
#, 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:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "anahtar %s: \"%s\" değişmedi\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "anahtar %s: gizli anahtar alındı\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, 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:1562
++#: g10/import.c:1575
#, 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:1663
++#: g10/import.c:1680
#, 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:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "gizli anahtarı alımına izin verilmez\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, 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:1851
++#: g10/import.c:1893
#, 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:1884
++#: g10/import.c:1926
#, 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:1960
++#: g10/import.c:2002
#, 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:1977
++#: g10/import.c:2019
#, 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:1979
++#: g10/import.c:2021
#, 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:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, 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:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, 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:2062
++#: g10/import.c:2104
#, 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:2075
++#: g10/import.c:2117
#, 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:2090
++#: g10/import.c:2132
#, 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:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "anahtar %s: yardımcı anahtar atlandı\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, 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:2198
++#: g10/import.c:2240
#, 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:2216
++#: g10/import.c:2258
#, 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:2230
++#: g10/import.c:2272
#, 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:2238
++#: g10/import.c:2280
#, 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:2367
++#: g10/import.c:2409
#, 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:2431
++#: g10/import.c:2473
#, 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:2447
++#: g10/import.c:2489
#, 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:2511
++#: g10/import.c:2553
#, 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:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
@@@ -3654,62 -2972,54 +3767,68 @@@ msgstr "`%s' anahtar bloğu oluşturuld
msgid "keyring '%s' created\n"
msgstr "`%s' anahtarlığı oluşturuldu\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "anahtar bloku özkaynağı `%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening `%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "'%s' açılırken hata: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "anahtar zinciri önbelleği yeniden oluşturulurken hata: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[yürürlükten kaldırma]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[öz-imza]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 kötü imza\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d kötü imza\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3720,17 -3030,14 +3839,17 @@@ msgstr "
"derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
"kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Şöyle böyle güveniyorum\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Tamamen güveniyorum\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3740,45 -3047,38 +3859,50 @@@ msgstr "
"1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
"güvence imzaları yapmayı mümkün kılar.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " İmzalanamıyor.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Kullanıcı kimliği \"%s\" imzalanabilir. "
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "İmzalayacak mısınız? (e/H veya y/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3787,12 -3087,10 +3911,12 @@@ msgstr "
"\"%s\" üzerindeki öz-imza\n"
"bir PGP 2.x tarzı imza.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
"Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3801,13 -3099,11 +3925,13 @@@ msgstr "
"\"%s\" üzerindeki imzanızın\n"
"kullanım süresi dolmuş.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H "
"veya y/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3816,46 -3112,37 +3940,46 @@@ msgstr "
"\"%s\" üzerindeki imzanız\n"
"dahili bir imza.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H veya "
"y/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Bu anahtarın kullanım süresi dolmuş!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"İmzanızın da aynı süreyle geçerli olmasını ister misiniz? (E/h veya Y/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3864,33 -3151,27 +3988,33 @@@ msgstr "
"Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
"doğruladınız? Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Cevabı bilmiyorum. %s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Tamamen kontrol edildi.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) İlişkisel denetim yaptım.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Çok dikkatli bir denetim yaptım.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3900,236 -3181,181 +4024,236 @@@ msgstr "
"gerçekten\n"
"emin misiniz?\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Bu bir öz-imza olacak.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "Bu anahtarı çok dikkatle sınadım.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "imzalama başarısız: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
"değiştirilecek bir anahtar parolası yok.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "anahtar parolası oluşturulurken hata: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "bir anahtar imzası doğru yere taşınıyor\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "kaydet ve çık"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "parmakizini gösterir"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "Simgelemi giriniz: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "anahtarı ve kullanıcı kimliğini gösterir"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "N kullanıcı kimliğini seçer"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "N yardımcı anahtarını"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "imzaları sınar"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "kullanıcı kimlikleri yerel olarak imzalar"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
"seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "bir kullanıcı kimliği ekler"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "bir foto kimliği ekler"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "seçili kullanıcı kimlikleri siler"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "bir yardımcı anahtar ekler"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "bir akıllı karta bir anahtar ekler"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "bir akıllı karttan bir anahtarı taşır"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "seçili yardımcı anahtarları siler"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "bir yürürlükten kaldırma anahtarı ekler"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "seçili kullanıcı kimliklerden imzaları siler"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
"anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
"değiştirir"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "seçili kullanıcı kimliğini asıl olarak imler"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "tercihleri listeler (uzman)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "tercihleri listeler (ayrıntılı)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
"belirler"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "anahtar parolasını değiştirir"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "sahibiningüvencesini değiştirir"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "anahtarı kullanıma sokar"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "anahtarı iptal eder"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "seçili foto kimlikleri gösterir"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"kullanışsız kullanıcı kimlikleri sıkıştırır ve kullanışsız imzaları "
"anahtardan kaldırır"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"kullanışsız kullanıcı kimlikleri sıkıştırır ve tüm imzaları anahtardan "
"kaldırır"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Gizli anahtar mevcut.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4148,271 -3374,215 +4272,272 @@@ msgstr "
" için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı olarak "
"(ltsign, tnrsign gibi).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Anahtar yürürlükten kaldırıldı."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "imza türü `%s' bilinmiyor\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%s kipindeyken bu komut kullanılamaz.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr ""
"Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Bu öz-imza gerçekten taşınacak mı? (e/H ya da y/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "Komut değiştirge olarak bir dosya ismi gerektiriyor\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "`%s' açılamıyor: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "En az bir anahtar seçmelisiniz.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr ""
"Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
"ya da y/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr ""
"Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr ""
"Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
"da y/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr ""
"Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
"(e/H ya da y/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr ""
"Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
"ya da y/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
"sahibiningüvencesi belirlenemez\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Belirlenecek tercih listesi:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
"musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "güncelleme başarısız: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "gizli anahtar \"%s\" yok: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "parmakizi geçersiz"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
#| msgid "failed to get the fingerprint\n"
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "parmakizinin alınması başarısız oldu\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Böyle bir kullanıcı kimliği yok.\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Özet: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Özellikler: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Anahtar sunucusu değişmez"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Tercih edilen anahtar sunucusu: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Simgelemler: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr ""
"Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
"kaldırılmış\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr ""
"Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(duyarlı)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "oluşturuldu: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "yürürlükten kaldırıldı: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "son kullanma tarihi: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "son kullanma tarihi: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "kullanımı: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "kart-no: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "güvencesi: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "geçerliliği: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Bu anahtar iptal edilmişti"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4420,17 -3590,12 +4545,17 @@@ 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:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "yürürlükten kaldırıldı"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "zamanaşımına uğradı"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4439,17 -3604,14 +4564,17 @@@ msgstr "
" farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
" kabul edilmesini sağlayabilirsiniz.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4458,78 -3620,61 +4583,78 @@@ msgstr "
"UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
" bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Bu doğru imza silinsin mi? (e/H/k veya y/N/k)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d imza silindi.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d imza silindi.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Hiçbir şey silinmedi.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "geçersiz"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4539,200 -3684,171 +4664,213 @@@ msgstr "
" eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
" ile sonuçlanabilir.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
"ekleyemeyebilirsiniz.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr ""
"Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
"olarak atanamaz\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
"kullanamazsınız\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
" kullanılamaz!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
"misiniz? (e/H ya da y/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
+ "misiniz? (e/H ya da y/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
"gerekmiyor\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Tercih ettiğiniz sunucunun adresini girin: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Simgelemi giriniz: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "Devam? (e/H ya da y/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "%s çittirmeli kullanıcı kimliği yok\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "%d indisli bir yardımcı anahtar yok\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "%d indisli bir yardımcı anahtar yok\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Kullanıcı kimliği: \"%s\"\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (dışarda geçersiz)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H veya "
"y/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (yürülükten kaldırılmaz)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
"Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H "
"veya y/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "gizli anahtar yok\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -4775,14 -3883,10 +4913,14 @@@ msgstr "öz-imza yazılıyor\n
msgid "writing key binding signature\n"
msgstr "anahtarı garantileyen imzayı yazıyor\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@@ -5082,41 -4137,36 +5220,46 @@@ msgstr "
msgid "Real name: "
msgstr "Adınız ve Soyadınız: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Ad ve soyadınızda geçersiz karakter var\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "E-posta adresiniz: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "geçerli bir E-posta adresi değil\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Önbilgi: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Önbilgi alanında geçersiz karakter var\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5127,7 -4177,6 +5270,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@@ -5143,37 -4192,30 +5286,37 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "AaYyEeTtKk"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr ""
"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Lütfen önce hatayı düzeltin\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5181,7 -4223,6 +5324,7 @@@ msgstr "
"Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@@ -5190,18 -4231,15 +5333,18 @@@ msgstr "
"Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
"giriniz."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr ""
"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
"tekrarlanacak"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5213,7 -4251,6 +5356,7 @@@ msgstr "
"seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5226,12 -4263,10 +5369,12 @@@ msgstr "
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5239,59 -4274,48 +5382,59 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "anahtar zaten mevcut\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "yeni anahtar üretiliyor\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Anahtar üretimi durduruldu.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "genel anahtarı `%s'e yazıyor\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5299,14 -4323,12 +5442,14 @@@ msgstr "
"Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
"\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5314,247 -4336,195 +5457,247 @@@ msgstr "
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "asla "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritik imza guvencesi: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "imza guvencesi: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Kritik tercihli anahtar sunucusu: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritik imza simgelemi: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "imza simgelemi: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 kötü imza\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d kötü imza\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Anahtar zinciri"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "\"%s\" atlandı: %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Anahtar parmakizi ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " Kart seri no. ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "`%s' anahtar zinciri önbellekleniyor\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anahtar zinciri oluşturuldu\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "yürürlükten kaldırılan anahtarlar arama sonuçlarına dahil edilir"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr ""
"anahtar kimliğine göre arama yapılırken yardımcı anahtarlar dahil edilir"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "imzaları doğrularken anahtarları özdevinimli olarak alır"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "tercihli anahtar sunucusunun adresini adrese atar"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "anahtarları alırken PKA kaydını bir anahtara atar"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "iptal edildi"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 anahtar %s adresinden tazeleniyor\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d anahtar %s adresinden tazeleniyor\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "anahtar, anahtar sunucusunda yok\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "%s anahtarı %s adresinden isteniyor\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "%s anahtarı %s adresine gönderiliyor\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "%s anahtarı %s adresinden isteniyor\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
@@@ -5590,7 -4554,6 +5733,7 @@@ msgstr "
"%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
"oluşturuldu\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
@@@ -5637,260 -4591,209 +5780,261 @@@ msgstr "Şifre çözme tamam\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "şifre çözme başarısız: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "özgün dosya adı = '%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "UYAR: çok sayıda salt metin görüldü\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "hiç imza yok\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\" deki imza KÖTÜ"
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\" deki imza zamanaşımına uğramış"
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\" deki imza iyi"
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "imza doğrulama engellendi\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "bu belirsiz imza verisi elde edilemiyor\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "İmza %s de\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " %s kullanılarak anahtar %s ile yapılmış\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, 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:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Anahtar burada:"
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[şüpheli]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " nam-ı diğer \"%s\""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Bu imzanın geçerliliği %s de bitti.\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "ikili"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "metinkipi"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "bilinmeyen"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritma: %s"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "İmza kontrol edilemedi: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "bir bağımsız imza değil\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "0x%02x sınıfı tek başına imza\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "eski stil (PGP 2.x) imza\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
#| msgid "fstat of `%s' failed in %s: %s\n"
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "`%s' için %s de durum bilgisi alınamıyor: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) %s de başarısız: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "UYARI: deneysel %s genel anahtar algoritması kullanılıyor\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "UYARI: Elgamal imza+şifre anahtarları artık önerilmiyor\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "UYARI: deneysel %s özet algoritması kullanılıyor\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "UYARI: %s özet algoritması artık önerilmiyor.\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s imzası, %s özet algoritması\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "lütfen yerine \"%s%s\" kullanınız\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "UYARI: \"%s\" komutu artık önerilmiyor - kullanmayın onu\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Sıkıştırılmamış"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "Sıkıştırılmamış|yok"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "bu ileti %s tarafından kullanılamayabilir\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "`%s' seçeneği belirsiz\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type `%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "imza türü `%s' bilinmiyor\n"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -6092,31 -4962,24 +6236,31 @@@ msgstr "Bu foto doğru mu? (e/H/ç vey
msgid "unable to display photo ID!\n"
msgstr "foto kimliği gösterilemiyor!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Belirtilmiş bir neden yok"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Anahtar tehlikede"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Anahtar artık kullanılmayacak"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Kullanıcı kimliği artık geçersiz"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "yürürlükten kaldırma sebebi: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "yürürlükten kaldırma açıklaması: "
@@@ -6130,53 -4993,42 +6274,53 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "bBmMaAkK"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Güven değeri belirtilmemiş:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " namı-diğer \"%s\"\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"%s: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = bilmiyorum, kem küm\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = güvence vermem\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Son derece güveniyorum\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = ana menüye dön\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " a = bu anahtarı atla\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " ç = çık\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6185,43 -5037,35 +6329,43 @@@ msgstr "
"Bu anahtar için asgari güvence seviyesi: %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Kararınız? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr ""
"Bu anahtarı gerçekten son derece güvenli yapmak istiyor musunuz? (e/H ya da "
"y/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Son derece güvenli bir anahtarla sonuçlanan sertifikalar:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair bir "
"belirti yok\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair sınırlı "
"bir belirti var\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Bu anahtarın ismi belirtilen şahsa ait olduğu umuluyor\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Bu anahtar bizim\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6231,117 -5075,92 +6375,117 @@@ msgstr "
"olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
"sonraki soruya da evet cevabı verebilirsiniz.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
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:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
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:546
++#: g10/pkclist.c:547
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:549
++#: g10/pkclist.c:550
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:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " Bu imza sahte anlamına gelebilir.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
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:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Bilgi: Bu anahtar iptal edildi.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, 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:588
++#: g10/pkclist.c:589
#, 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:600
++#: g10/pkclist.c:601
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:608
++#: g10/pkclist.c:609
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:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
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:632
++#: g10/pkclist.c:633
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:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Bu imza SAHTE olabilir.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
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:651
++#: g10/pkclist.c:652
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:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: atlandı: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: atlandı: genel anahtar iptal edildi\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: atlandı: genel anahtar zaten var\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
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:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Şimdiki alıcılar:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6349,75 -5168,58 +6493,75 @@@ msgstr "
"\n"
"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Böyle bir kullanıcı kimliği yok.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
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:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Genel anahtar iptal edildi.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "geçerli adresler yok\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, 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:1566
++#: g10/pkclist.c:1568
#, 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"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "`%s' oluşturulurken hata: %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Bağımsız imza.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Lütfen veri dosyasının ismini girin: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "standart girdiden okuyor ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "imzalı veri yok\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "imzalı veri '%s' açılamadı\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "imzalı veri fd=%d açılamadı: %s\n"
@@@ -6457,8 -5252,6 +6601,8 @@@ msgstr "BİLGİ: %s gizli anahtarını
msgid "Note: key has been revoked"
msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet başarısız: %s\n"
@@@ -6468,39 -5260,36 +6612,45 @@@
msgid "key %s has no user IDs\n"
msgstr "anahtar %s: kullanıcı kimliği yok\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Yürürlükten kaldıran:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "Gizli anahtar mevcut.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr ""
"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
"da y/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "ASCII zırhlı çıktı istendi.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet başarısız: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
@@@ -6508,7 -5297,6 +6658,7 @@@ msgstr "
"Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
"ya da y/N) "
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6516,20 -5304,29 +6666,34 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "gizli anahtar \"%s\" yok: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr ""
"Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
"ya da y/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6547,34 -5344,27 +6711,34 @@@ msgstr "
"Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
"bir kasada da muhafaza edebilirsiniz.\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "İptal"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Yürürlükten kaldırma sebebi: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(açıklama verilmedi)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Bu tamam mı? (e/H ya da y/N) "
@@@ -6601,44 -5387,36 +6765,44 @@@ msgstr "%s anahtarı, güvensiz bir çi
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "DSA anahtarı %s, %u bitlik veya daha geniş bir çittirim gerektiriyor\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "UYARI: iletideki imza özeti çelişkili\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "genel anahtar %s imzadan %lu saniye daha yeni\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "genel anahtar %s imzadan %lu saniye daha yeni.\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr ""
"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6646,32 -5424,27 +6810,32 @@@ msgstr "
"anahtar %s bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
#| msgid "NOTE: signature key %s has been revoked\n"
msgid "Note: signature key %s has been revoked\n"
msgstr "BİLGİ: imza anahtarı %s yürürlükten kaldırılmıştı\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
"kaynaklandığı sanılıyor\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr ""
"anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
@@@ -6718,29 -5485,23 +6882,29 @@@ msgstr "
msgid "signing:"
msgstr "imzalanıyor:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s şifrelemesi kullanılmayacak\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\" atlandı: tekrarlanmış\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "atlandı: gizli anahtar zaten var\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
@@@ -6788,7 -5541,6 +6952,7 @@@ msgstr "`%s' deki güvence kaydını ar
msgid "read error in '%s': %s\n"
msgstr "`%s' için okuma hatası: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
@@@ -6819,7 -5566,6 +6983,7 @@@ msgstr "güvence veritabanı %lu kaydı
msgid "trustdb transaction too large\n"
msgstr "güvence veritabanı işlemi çok uzun\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -6937,116 -5660,93 +7101,116 @@@ msgstr "%d karakterden daha uzun metin
msgid "input line longer than %d characters\n"
msgstr "girdi satırı %d karakterden daha uzun\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "`%s' geçerli bir anahtar kimliği değil\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "anahtar %s güvence veritabanında birden fazla görünüyor\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "anahtar %s: güvenli anahtar için genel anahtar yok - atlandı\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
"varsayılıyor\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "%s güvence modeli kullanılıyor\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "bir güvence veritabanı denetimi gereksiz\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "sonraki güvence veritabanı denetimi %s de\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
#| msgid "no need for a trustdb check with `%s' trust model\n"
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
#| msgid "no need for a trustdb update with `%s' trust model\n"
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "genel anahtar %s yok: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "lütfen bir --check-trustdb yapın\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "güvence veritabanı denetleniyor\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "son derece güvenli bir anahtar yok\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "son derece güvenli %s için genel anahtar yok\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7054,7 -5754,6 +7218,7 @@@ msgstr "
"derinlik: %d geçerli: %3d imzalı: %3d güvenilir: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7297,11 -5947,9 +7461,11 @@@ msgstr "CHV%d için PIN çok kısa; asg
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "karttan CHV durumu alınırken hata\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "kart kalıcı olarak kilitli!\n"
@@@ -7440,12 -6060,10 +7604,12 @@@ msgstr "kart %s özet algoritmasını d
msgid "signatures created so far: %lu\n"
msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktır\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@@ -7467,7 -6082,6 +7631,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:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
@@@ -7537,12 -6139,10 +7701,12 @@@ msgstr "
"Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
"kullanın\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %d için eylemci başlatıldı\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %d için eylemci sonlandı\n"
@@@ -7981,7 -6489,6 +8145,7 @@@ msgstr "%d. satır: `%s' anahtar maşas
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "%d. satır: anahtar üretimi başarısızlığa uğradı: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8598,7 -6985,6 +8762,7 @@@ msgstr "İçerilen sertifikalar
msgid " runtime cached certificates: %u\n"
msgstr "eşleşen sertifika sayısı: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -8610,8 -6995,6 +8774,8 @@@ msgstr " ( sertifikanın oluşturulu�
msgid "certificate cached\n"
msgstr "sertifika iyi durumda\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -8683,7 -7055,6 +8847,7 @@@ msgstr "satır alımı başarısız: %s
msgid "not removing file '%s'\n"
msgstr "zırhlama başarısız: %s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing cache file: %s\n"
@@@ -8928,239 -7255,196 +9092,239 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "saklanmış bayraklar alınırken hata: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "`%s' çittirim algoritması geçersiz\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr ""
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
#| msgid "iconv_open failed: %s\n"
msgid "converting S-expression failed: %s\n"
msgstr "iconv_open başarısız: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "creating S-expression failed: %s\n"
msgstr "satır alımı başarısız: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet başarısız: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
#| msgid "error getting serial number of card: %s\n"
msgid "error getting update times of CRL: %s\n"
msgstr "kartın seri numarası alınırken hata: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting CRL item: %s\n"
msgstr "yeni PIN alınırken hata: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error inserting item into temporary cache file: %s\n"
msgstr "geçeci dosyaya yazma hatası: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
#| msgid "no issuer found in certificate"
msgid "no CRL issuer found in CRL: %s\n"
msgstr "sertifikacı kim belli değil"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "imza doğrulama engellendi\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
#| msgid "error reading list of trusted root certificates\n"
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "ksba_crl_new failed: %s\n"
msgstr "select başarısız: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "read başarısız: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "removed stale temporary cache file '%s'\n"
msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
#| msgid "failed to create temporary file `%s': %s\n"
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error creating temporary cache file '%s': %s\n"
msgstr "geçici dosya oluşturulurken hata: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "gizliyi güncelleme başarısız: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
#| msgid "error writing to temporary file: %s\n"
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "geçeci dosyaya yazma hatası: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
#| msgid "error creating temporary file: %s\n"
msgid "error closing temporary cache file '%s': %s\n"
msgstr "geçici dosya oluşturulurken hata: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
#| msgid "error reading input: %s\n"
msgid "error reading CRL extensions: %s\n"
msgstr "girdi okunurken hata: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "creating cache file '%s'\n"
msgstr "boru oluşturulurken hata: %s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid notation data found\n"
msgid " WARNING: invalid cache record length\n"
msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s: serbest kaydı okuma hatası: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
#| msgid "problem re-searching certificate: %s\n"
msgid "problem reading cache key: %s\n"
msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
#| msgid "error reading nonce on fd %d: %s\n"
msgid "error reading cache entry from db: %s\n"
msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "crl_fetch via DP failed: %s\n"
msgstr "read başarısız: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
#| msgid "checking the trust list failed: %s\n"
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "güvence listesinin sınanması başarısız: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9210,85 -7484,69 +9374,85 @@@ msgstr "`%s' %s üzerinden alınırken
msgid "error retrieving '%s': http status %u\n"
msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
#| msgid "certificate `%s' not found: %s\n"
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "sertifika \"%s\" yok: %s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
#| msgid "certificate `%s' not found: %s\n"
msgid "certificate search not possible due to disabled %s\n"
msgstr "sertifika \"%s\" yok: %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
#| msgid " (certificate created at "
msgid "add a certificate to the cache"
msgstr " ( sertifikanın oluşturuluşu: "
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
#| msgid "Included certificates"
msgid "validate a certificate"
msgstr "İçerilen sertifikalar"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
#| msgid "Included certificates"
msgid "lookup a certificate"
msgstr "İçerilen sertifikalar"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
#| msgid "Included certificates"
msgid "lookup only locally stored certificates"
msgstr "İçerilen sertifikalar"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "load a CRL into the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
#| msgid "export certificates"
msgid "expect certificates in PEM format"
msgstr "sertifikaları ihraç eder"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr ""
"Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9296,247 -7554,172 +9460,216 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error reading certificate from stdin: %s\n"
msgstr "serifika saklanırken hata: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
#| msgid "error reading from %s: %s\n"
msgid "error reading certificate from '%s': %s\n"
msgstr "%s okunurken hata: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "güncelleme başarısız: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "loading CRL '%s' failed: %s\n"
msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "validation of certificate failed: %s\n"
msgstr "\"%s\" sertifikası silinemedi: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "sertifika iyi durumda\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
#| msgid "certificate has been revoked"
msgid "certificate has been revoked\n"
msgstr "sertifika yürürlükten kaldırılmıştı"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
#| msgid "deleting certificate \"%s\" failed: %s\n"
msgid "certificate check failed: %s\n"
msgstr "\"%s\" sertifikası silinemedi: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, 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/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- #, fuzzy
- #| msgid "no running dirmngr - starting `%s'\n"
- msgid "no running dirmngr - starting one\n"
- msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- #| msgid "malformed DIRMNGR_INFO environment variable\n"
- msgid "malformed %s environment variable\n"
- msgstr "DIRMNGR_INFO ortam değişkeni hatalı\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "desteklenmeyen algoritma: %s"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: 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:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, 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:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, 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:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "PKA aramalarına izin verilir (DNS istekleri)"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 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:207
++#: dirmngr/dirmngr.c:209
#, 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:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9549,13 -7732,11 +9682,13 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, 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:352
++#: dirmngr/dirmngr.c:355
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -9567,88 -7748,71 +9700,88 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, 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:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "kullanımı: gpgsm [seçenekler] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, 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:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, 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:1582
++#: dirmngr/dirmngr.c:1591
#, 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:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "parmakizi geçersiz"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, 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:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "zorlanmadı"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9917,12 -8030,10 +10050,12 @@@ msgstr "anahtar %1$s, %3$s sunucusunun
msgid "malloc failed: %s\n"
msgstr "select başarısız: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9960,11 -8065,11 +10093,13 @@@ msgstr "%s okunurken hata: %s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ #| msgid "certificate `%s' not found: %s\n"
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "sertifika \"%s\" yok: %s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -10131,80 -8206,70 +10266,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "satır göndirimi başarısız: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
#| msgid "sending line failed: %s\n"
msgid "assuan_inquire failed: %s\n"
msgstr "satır göndirimi başarısız: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select başarısız: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error sending data: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select başarısız: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select başarısız: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, 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:2304
++#: dirmngr/server.c:2409
+ #, 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:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10476,13 -8481,11 +10617,13 @@@ msgstr "Çıktı biçimini denetleyen s
msgid "Options controlling the interactivity and enforcement"
msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
+#: tools/gpgconf-comp.c:911
#, fuzzy
#| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr "Güvenliği denetleyen seçenekler"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "HTTP sunucuları için yapılandırma"
diff --cc po/uk.gmo
index 9f65406,0000000..44b52cc
mode 100644,000000..100644
Binary files differ
diff --cc po/uk.po
index a7bd0e5,af6f7b5..7759792
--- a/po/uk.po
+++ b/po/uk.po
@@@ -5,10 -5,9 +5,10 @@@
# Yuri Chornoivan <yurchor at ukr.net>, 2011, 2014, 2015.
msgid ""
msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.0-gitfe8619d\n"
+ "Project-Id-Version: GNU gnupg 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-10-09 17:17+0200\n"
- "PO-Revision-Date: 2015-02-18 19:09+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
+ "PO-Revision-Date: 2015-10-23 19:33+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
"Language: uk\n"
@@@ -38,47 -34,29 +38,37 @@@ msgstr "_Гаразд
msgid "|pinentry-label|_Cancel"
msgstr "_Скасувати"
+#: agent/call-pinentry.c:449
- #, fuzzy
- #| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_Yes"
- msgstr "_Гаразд"
+ msgstr "_Так"
+#: agent/call-pinentry.c:450
- #, fuzzy
- #| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_No"
- msgstr "_Гаразд"
+ msgstr "_Ні"
+#: agent/call-pinentry.c:451
msgid "|pinentry-label|PIN:"
msgstr "Пінкод:"
+#: agent/call-pinentry.c:452
- #, fuzzy
- #| msgid "|pinentry-label|_Cancel"
msgid "|pinentry-label|_Save in password manager"
- msgstr "_Скасувати"
+ msgstr "_Зберегти у засобі керування паролями"
+#: agent/call-pinentry.c:453
- #, fuzzy
- #| msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "Справді хочете остаточно вилучити закритий ключ OpenPGP:"
+ msgstr "Справді хочете зробити пароль видимим на екрані?"
+#: agent/call-pinentry.c:455
msgid "|pinentry-tt|Make passphrase visible"
- msgstr ""
+ msgstr "Зробити пароль видимим"
+#: agent/call-pinentry.c:456
- #, fuzzy
- #| msgid "Enter new passphrase"
msgid "|pinentry-tt|Hide passphrase"
- msgstr "Вкажіть новий пароль"
+ msgstr "Приховати пароль"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "Якість:"
@@@ -88,13 -66,11 +78,13 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"Якість введеного вище тексту.\n"
"Дані щодо критеріїв якості можна отримати у вашого адміністратора."
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
@@@ -102,7 -78,6 +92,7 @@@ msgstr "
"Будь ласка, вкажіть ваш пінкод, щоб ключ можна було розблокувати для цього "
"сеансу"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
@@@ -110,53 -85,40 +100,53 @@@ msgstr "
"Будь ласка, вкажіть ваш пароль, щоб ключ можна було розблокувати для цього "
"сеансу"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
- msgstr ""
+ msgstr "Пінкод:"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Пароль:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "паролі не збігаються, повторіть спробу"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (спроба %d з %d)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr "Повторіть:"
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "Занадто довгий пінкод"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "Занадто довгий пароль"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "Некоректні символи у пінкоді"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "Занадто короткий пінкод"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "Помилковий пінкод"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "Помилковий пароль"
@@@ -166,24 -127,10 +156,24 @@@ msgid "ssh keys greater than %d bits ar
msgstr ""
"підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не вдалося створити «%s»: %s\n"
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не вдалося відкрити «%s»: %s\n"
@@@ -258,11 -192,9 +248,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "не вдалося створити потік даних з сокета: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "Будь ласка, вставте картку з серійним номером"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "Будь ласка, вийміть поточну картку і вставте картку з серійним номером"
@@@ -368,9 -280,7 +358,8 @@@ msgstr[0] "У паролі має бу�
msgstr[1] "У паролі має бути принаймні %u цифри або%%0Aспеціальних символи."
msgstr[2] "У паролі має бути принаймні %u цифр або%%0Aспеціальних символів."
+#: agent/genkey.c:278
- #, fuzzy, c-format
- #| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
+ #, c-format
msgid "A passphrase may not be a known term or match%%0Acertain pattern."
msgstr ""
"Паролем не повинно бути слово зі словника або слово%%0A, що відповідає "
@@@ -398,41 -303,27 +387,41 @@@ msgstr "
"@Параметри:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "запустити у режимі фонової служби (фоновий)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "запустити у режимі сервера (основному)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "докладний режим"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "дещо зменшити кількість повідомлень"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "виведення команд у форматі sh"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "виведення команд у форматі csh"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "прочитати параметри з вказаного файла"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "не від’єднувати від консолі"
@@@ -456,13 -342,9 +445,11 @@@ msgstr "використовувати
msgid "do not use the SCdaemon"
msgstr "не використовувати SCdaemon"
+#: agent/gpg-agent.c:178
- #, fuzzy
- #| msgid "|NAME|connect to host NAME"
msgid "|NAME|accept some commands via NAME"
- msgstr "|NAME|встановити з’єднання з вузлом за вказаною назвою"
+ msgstr "приймати певні команди через NAME"
+#: agent/gpg-agent.c:194
msgid "ignore requests to change the TTY"
msgstr "ігнорувати запити щодо зміни TTY"
@@@ -478,13 -357,9 +465,11 @@@ msgstr "вважати кешован�
msgid "do not use the PIN cache when signing"
msgstr "не використовувати кеш пін-кодів для підписування"
+#: agent/gpg-agent.c:215
- #, fuzzy
- #| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
- msgstr "не дозволяти повторне використання старих паролів"
+ msgstr "заборонити використання зовнішнього кешу паролів"
+#: agent/gpg-agent.c:217
msgid "disallow clients to mark keys as \"trusted\""
msgstr "заборонити клієнтам позначати ключі як надійні"
@@@ -496,11 -369,9 +481,11 @@@ msgstr "дозволити попере
msgid "allow caller to override the pinentry"
msgstr "дозволити функції виклику перевизначати pinentry"
+#: agent/gpg-agent.c:224
msgid "allow passphrase to be prompted through Emacs"
- msgstr ""
+ msgstr "дозволити запит пароля з Emacs"
+#: agent/gpg-agent.c:226
msgid "enable ssh support"
msgstr "увімкнути підтримку ssh"
@@@ -511,11 -381,6 +496,11 @@@ msgstr "увімкнути підтри
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
@@@ -531,140 -394,102 +516,139 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
"Керування закритими ключами у @GNUPG@\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "вказано некоректне значення рівня діагностики «%s»\n"
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
- #: agent/gpg-agent.c:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметрів «%s»: %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "прочитати параметри з «%s»\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: agent/gpg-agent.c:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "не вдалося створити сокет: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "назва сокета «%s» є надто довгою\n"
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
- #: agent/gpg-agent.c:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "помилка під час спроби отримання поточного стану сокета\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "помилка listen(): %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "очікування даних на сокеті «%s»\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "не вдалося створити каталог «%s»: %s\n"
- #: agent/gpg-agent.c:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "створено каталог «%s»\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "помилка stat() щодо «%s»: %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "не можна використовувати як домашній каталог «%s»\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr ""
"помилка під час спроби читання поточного стану на файловому дескрипторі %d: "
"%s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "запущено обробки 0x%lx для файлового дескриптора %d\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обробник 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "запущено обробник ssh 0x%lx для дескриптора файла %d\n"
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "помилка pth_select: %s — очікування у 1 с\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s зупинено\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "у цьому сеансі не запущено gpg-agent\n"
@@@ -681,8 -504,6 +665,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
"Керування кешем паролів\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -690,9 -511,6 +674,9 @@@ msgstr "
"@Команди:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -746,7 -556,6 +730,7 @@@ msgstr "скасовано\n
msgid "error while asking for the passphrase: %s\n"
msgstr "помилка під час спроби запиту пароля: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, c-format
msgid "error opening '%s': %s\n"
msgstr "помилка під час відкриття «%s»: %s\n"
@@@ -862,15 -653,13 +846,15 @@@ msgstr "Змінити пароль
msgid "I'll change it later"
msgstr "Я зміню його пізніше"
+#: agent/findkey.c:1266
- #, fuzzy, c-format
- #| msgid "Do you really want to delete the selected keys? (y/N) "
+ #, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
- msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/Н) "
+ msgstr ""
+ "Справді хочете вилучити ключ, що визначається keygrip%%0A %s%%0A %%C%%0A?"
+#: agent/findkey.c:1290 agent/findkey.c:1304
msgid "Delete key"
msgstr "Вилучити ключ"
@@@ -935,8 -710,6 +919,8 @@@ msgstr "помилка під час с
msgid "error creating a stream for a pipe: %s\n"
msgstr "помилка під час спроби створення потоку для каналу: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "помилка під час спроби розгалужування процесу: %s\n"
@@@ -1071,12 -815,10 +1055,12 @@@ msgstr "%s:%u: застарілий п�
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
+#: common/miscellaneous.c:479
#, c-format
msgid "unknown debug flag '%s' ignored\n"
- msgstr ""
+ msgstr "невідомий прапорець діагностики «%s» проігноровано\n"
+#: common/asshelp.c:410
#, c-format
msgid "no running gpg-agent - starting '%s'\n"
msgstr "не запущено gpg-agent — запускаємо «%s»\n"
@@@ -1086,7 -827,6 +1070,7 @@@
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "очікування на працездатність агента… (%d с)\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr "встановлено з’єднання з агентом\n"
@@@ -1104,7 -841,6 +1088,7 @@@ msgstr "Dirmngr не запущено �
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "очікування на працездатність dirmngr… (%d с)\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr "встановлено з’єднання з dirmngr\n"
@@@ -1362,7 -1038,6 +1346,7 @@@ msgstr "параметр «%.50s» є �
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда «%.50s» є неоднозначною\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "вихід за межі області пам’яті\n"
@@@ -1541,19 -1178,14 +1525,19 @@@ msgstr "не вдалося пропу�
msgid "Enter passphrase: "
msgstr "Введіть пароль: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Не вдалося отримати доступ до картки OpenPGP: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Виявлено картку OpenPGP з номером %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "це не можна робити у пакетному режимі\n"
@@@ -1565,156 -1195,117 +1549,156 @@@ msgstr "Цією командою мо�
msgid "Reset Code not or not anymore available\n"
msgstr "Немає коду скидання або код скидання вже недоступний\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ваш вибір? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[не встановлено]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "чоловіча"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "жіноча"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "не вказано"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "не увімкнено"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "увімкнено"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
"Помилка: у поточній версії можна використовувати лише звичайний ASCII.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "Помилка: символ «<» не можна використовувати.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "Помилка: не можна використовувати подвійні пробіли.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "Прізвище власника картки: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "Ім’я власника картки: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "Помилка: складена назва є занадто довгою (максимум — %d символів).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "Адреса для отримання відкритого ключа: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Помилка: адреса є занадто довгою (максимум — %d символів).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "помилка під час спроби розподілу пам’яті: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, c-format
msgid "error reading '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "Дані користувача (назва запису): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
"Помилка: дані користувача є занадто довгими (максимум — %d символів).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "Особисті дані DO: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
"Помилка: особисті дані D0 є занадто довгими (максимум — %d символів).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "Основна мова: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "Помилка: некоректна довжина рядка основної мови.\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "Помилка: некоректні символи у рядку основної мови.\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Стать (чоловіча (M), жіноча (F) або пробіл): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "Помилка: некоректна відповідь.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "Відбиток CA: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Помилка: некоректне форматування відбитка.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "дія над ключем неможлива: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "не є карткою OpenPGP"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "помилка під час отримання даних поточного ключа: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "Замінити вже створений ключ? (y/N або т/Н) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1725,56 -1316,44 +1709,56 @@@ msgstr "
" ознайомтеся з документацією до вашої картки, щоб\n"
" визначити дозволені розміри.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Якому розміру ключа підписування ви надаєте перевагу? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Яким має бути розмір ключа для шифрування? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Якому розміру ключа для розпізнавання ви надаєте перевагу? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлено до %u бітів\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"Зараз налаштування картки буде змінено для створення %u-бітового ключа\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "помилка під час спроби зміни розміру ключа з %d на %u: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Створити резервну копію ключа шифрування поза карткою? (Y/n або Т/н) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
msgid "Note: keys are already stored on the card!\n"
msgstr "ЗАУВАЖЕННЯ: ключі вже збережено на картці!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "Замірити вже створені ключі? (y/N або т/Н) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1785,141 -1364,106 +1769,141 @@@ msgstr "
" PIN = «%s» Адміністративний PIN = «%s»\n"
"Вам слід змінити параметри за допомогою команди --change-pin\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "Виберіть тип ключа, який слід створити:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) Ключ підписування\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) Ключ шифрування\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) Ключ розпізнавання\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "Некоректний вибір.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "Виберіть сховище для зберігання ключа:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Помилка KEYTOCARD: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
msgid "This command is not supported by this card\n"
msgstr "Цією карткою не передбачено підтримки вказаної команди\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr ""
"Зауваження: у результаті виконання цієї команди усі ключі на картці буде "
"знищено!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
msgid "Continue? (y/N) "
msgstr "Продовжити? (y (так)/N (ні)) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
"Справді хочете скинути усе до типових налаштувань? (введіть «yes» («так»)) "
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "вийти з цього меню"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "показати керівні команди"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "показати цю довідкову інформацію"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "показати всі доступні дані"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "змінити ім’я власника картки"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "змінити адресу для отримання ключа"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "отримати ключ, вказаний у полі адреси картки"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "змінити ім’я користувача"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "змінити основну мову"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "змінити поле статі власника картки"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "змінити відбиток CA"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "увімкнути або вимкнути позначку примусового пінкоду підпису"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "створити ключі"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "меню зміни або розблокування пінкоду"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "перевірити пінкод і показати список всіх даних"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "розблокувати під коду за допомогою коду скидання"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr "знищити усі ключі і дані"
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/картка> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "Команда адміністратора\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "Команди адміністрування дозволено\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "Команди адміністрування заборонено\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "Некоректна команда (скористайтеся командою «help»)\n"
@@@ -1927,73 -1470,60 +1911,80 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output не працює з цією командою\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, c-format
msgid "can't open '%s'\n"
msgstr "не вдалося відкрити «%s»\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ «%s» не знайдено: %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "помилка під час спроби читання блокування ключа: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "ключ «%s» не знайдено: %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(якщо ключ не задано відбитком)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "цього не можна робити у пакетному режимі без «--yes»\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "Вилучити цей ключ зі сховища? (y/N або т/Н) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Цей ключ є закритим! Вилучити його? (y/N або т/Н) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "помилка під час спроби вилучення закритого %s: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "ключ"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "subkey"
msgstr "підключ"
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "не вдалося вилучити блокування ключа: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "дані щодо довіри до власника вилучено\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "маємо закритий ключ для відкритого ключа «%s»!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr ""
"спершу скористайтеся параметром «--delete-secret-keys» для його вилучення.\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "помилка під час спроби створення пароля: %s\n"
@@@ -2046,7 -1568,6 +2037,7 @@@ msgstr "
"примусове використання симетричного шифру %s (%d) не відповідає параметрам "
"отримувача\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "не можна використовувати %s у режимі %s\n"
@@@ -2131,270 -1636,222 +2122,289 @@@ msgstr "УВАГА: не вдалос�
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "УВАГА: не вдалося вилучити тимчасовий каталог «%s»: %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr ""
"експортувати підписи, які позначено як придатні лише для локального "
"використання"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
"експортувати ідентифікатори користувача атрибута (типово фотоідентифікатори)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "експортувати ключі відкликання, позначені як «важливі»"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "вилучити невикористовувані частини ключа під час експортування"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "вилучити максимум частин з ключа під час експортування"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "експортування закритих ключів заборонено\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ у стилі PGP 2.x — пропущено\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "ключ %s: матеріал ключа на карті — пропущено\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "УВАГА: нічого не експортовано\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[Ідентифікатор не знайдено]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "автоматично отримано «%s» за допомогою %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "помилка під час спроби отримання «%s» за допомогою %s: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "Без відбитка"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "закритий ключ «%s» не знайдено: %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "не вказано аргументу до параметра «%.50s»\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|NAME|використовувати вказаний типовий закритий ключ"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Некоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
"uid\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "використовуємо підключ %s замість основного ключа %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "створити підпис"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "створити текстовий підпис"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "створити від’єднаний підпис"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "зашифрувати дані"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "шифрувати лише за допомогою симетричного шифру"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "розшифрувати дані (типова дія)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "перевірити підпис"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "показати список ключів"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "показати список ключів і підписів"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "показати список і перевірити підписи ключів"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "показати список ключів і відбитків"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "показати список закритих ключів"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "створити пару ключів"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
msgid "quickly generate a new key pair"
msgstr "швидке створення пари ключів"
- #: g10/gpg.c:419
- #, fuzzy
- #| msgid "quickly generate a new key pair"
++#: g10/gpg.c:427
msgid "quickly add a new user-id"
- msgstr "швидке створення пари ключів"
+ msgstr "швидке додавання нового ідентифікатора користувача"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr "повноцінне створення пари ключів"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "створити сертифікат відкликання"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "вилучити ключі з відкритого сховища ключів"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "вилучити ключів з закритого сховища ключів"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
msgid "quickly sign a key"
msgstr "швидко підписати ключ"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
msgid "quickly sign a key locally"
msgstr "швидко підписати ключ локально"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "підписати ключ"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "підписати ключ локально"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "підписати або редагувати ключ"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "змінити пароль"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "експортувати ключі"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "експортувати ключі на сервер ключів"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "імпортувати ключі з сервера ключів"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "шукати ключі на сервері ключів"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "оновити всі ключів з сервера ключів"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "імпортувати/об’єднати ключі"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "показати дані про стан картки"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "змінити дані на картці"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "змінити пінкод картки"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "оновити базу даних довіри"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "показати контрольні суми повідомлень"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "запустити у режимі сервера"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr "встановити правила TOFU для ключа (good, unknown, bad, ask, auto)"
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "створити дані у форматі ASCII"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|USER-ID|використовувати для створення підписів або розшифрування вказаний "
"ідентифікатор"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "використовувати канонічний текстовий режим"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|FILE|записати дані до вказаного файла"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "не вносити змін"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "запитувати перед перезаписом"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "строго використовувати стандарт OpenPGP"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2403,7 -1860,6 +2413,7 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man))\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2424,11 -1880,9 +2434,11 @@@ msgstr "
" --list-keys [назви] показати ключі\n"
" --fingerprint [назви] показати відбитки\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Використання: @GPG@ [параметри] [файли] (-h — довідка)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2438,7 -1892,6 +2448,7 @@@ msgstr "
"Підписування, перевірка підписів, шифрування або розшифрування\n"
"Типова дія залежатиме від вхідних даних\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2446,76 -1899,61 +2456,76 @@@ msgstr "
"\n"
"Підтримувані алгоритми:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "Відкритий ключ: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "Шифр: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "Хеш: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "Стиснення: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "користування: %s [параметри] %s\n"
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "несумісні команди\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "у визначенні групи «%s» немає знаку «=»\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2523,21 -1961,18 +2533,21 @@@ msgstr "
"УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
"«%s» не є безпечним\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2545,497 -1980,448 +2555,569 @@@ msgstr "
"УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "невідомий пункт налаштувань «%s»\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "показувати фотоідентифікатори у списках ключів"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
msgid "show key usage information during key listings"
msgstr "показувати дані щодо використання ключа у списках ключів"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "показувати адреси правил у списках підписів"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "показувати всі примітки у списках підписів"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "показувати стандартні примітки IETF у списках підписів"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "показувати примітки користувача у списках підписів"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr "показувати адреси основних серверів ключів у списках підписів"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"ключів"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "показувати відкликані та застарілі підключі у списках ключів"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "показувати назву сховища ключів у списках ключів"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "показувати дати завершення строків дії у списку підписів"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "Доступні ключі:\n"
+
++#: g10/gpg.c:1998
+ #, c-format
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "невідомі правила TOFU «%s»\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "невідомий формат бази даних TOFU «%s»\n"
+
++#: g10/gpg.c:2085
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
- #: g10/gpg.c:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "параметр «%.50s» є неоднозначним\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring '%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt занадто стара (потрібна — %s, маємо %s)\n"
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "некоректний режим pinentry, «%s»\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "«%s» не є коректним набором символів\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "не вдалося обробити адресу сервера ключів\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: некоректні параметри сервера ключів\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "некоректні параметри сервера ключів\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: некоректні параметри імпортування\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "некоректні параметри імпортування\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: некоректні параметри експортування\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "некоректні параметри експортування\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: некоректні параметри побудови списку\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "некоректні параметри побудови списку\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "показувати фотоідентифікатори під час перевірки підписів"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "показувати адреси правил під час перевірки підписів"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "показувати всі примітки під час перевірки підписів"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "показувати стандартні примітки IETF під час перевірки підписів"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "показувати вказані користувачем примітки під час перевірки підписів"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"показувати адреси основних серверів ключів у списках перевірки підписів"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr ""
"показувати чинність ідентифікаторів користувача під час перевірки підписів"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"перевірки підписів"
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr ""
"показувати лише основний ідентифікатор користувача під час перевірки підписів"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "перевірити підписи за допомогою даних PKA"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "підняти рівень довіри до підписів з коректними даними PKA"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: некоректні параметри перевірки\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "некоректні параметри перевірки\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не вдалося встановити шлях для запуску у значення %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: некоректний список auto-key-locate\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "некоректний список auto-key-locate\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "УВАГА: %s перевизначає %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не можна використовувати разом з %s!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s є зайвим, якщо використано %s!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "УВАГА: запущено з фіктивним системним часом: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "вибраний алгоритм шифрування є некоректним\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "вибраний алгоритм стискання є некоректним\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "значення completes-needed має бути більшим за 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "значення marginals-needed має перевищувати 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "некоректне значення default-cert-level; має бути 0, 1, 2 або 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
"S2K (0)\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "некоректні типові параметри\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "некоректні особисті параметри шифрування\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "некоректні особисті параметри контрольної суми\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "некоректні особисті параметри стискання\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ще не може працювати разом з %s\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
- #: g10/gpg.c:3497
++#: g10/gpg.c:3868
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
"%s\n"
- #: g10/gpg.c:3502
++#: g10/gpg.c:3873
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
"ключем\n"
- #: g10/gpg.c:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, fuzzy, c-format
+ #| msgid "line %d: invalid date given\n"
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "рядок %d: вказано некоректну дату\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [назва файла]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [назва файла]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [назва файла]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [назва файла]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
"mode 0\n"
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [назва файла]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [назва файла]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [назва файла]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
"s2k-mode 0\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
"%s\n"
- #: g10/gpg.c:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва файла]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [назва файла]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [назва файла]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [команди]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd <ідентифікатор-користувача>"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "помилка під час спроби експортування ключа: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "помилка пошуку на сервері ключів: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "помилка оновлення з сервера ключів: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "помилка перетворення з формату ASCII: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "помилка перетворення у формат ASCII: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "некоректний алгоритм хешування «%s»\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "'%s' does not appear to be a valid key id, fingerprint or key grip.\n"
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або keygrip.\n"
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[назва файла]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "Почніть вводити ваше повідомлення...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "вказана адреса правил сертифікації є некоректною\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "вказана адреса правил підписування є некоректною\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "вказана адреса основного сервера ключів є некоректною\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "визначити ключі з файла сховища ключів ФАЙЛ"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "записувати до дескриптора файла дані щодо стану"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Використання: gpgv [параметри] [файли] (-h — довідка)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3210,7 -2562,6 +3292,7 @@@ msgstr "
"оновити записи перевад можна за допомогою команди: gpg --edit-key %s updpref "
"save\n"
- #: g10/import.c:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: немає ідентифікатор користувача\n"
@@@ -3220,7 -2570,6 +3302,7 @@@
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr "відкинуто екранувальником імпорту"
@@@ -3243,7 -2588,6 +3325,7 @@@ msgstr "ключ %s: немає чин�
msgid "this may be caused by a missing self-signature\n"
msgstr "причиною цього може бути те, що немає самопідпису\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
@@@ -3253,256 -2596,219 +3335,271 @@@
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новий ключ — пропущено\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "не виявлено придатного до запису сховища ключів: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "записуємо до «%s»\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "помилка під час спроби запису сховища ключів «%s»: %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не відповідає нашій копії\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
- #: g10/import.c:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
- #: g10/import.c:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: «%s» 1 новий ідентифікатор користувача\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: «%s» %d нових ідентифікаторів користувачів\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: «%s» 1 новий підпис\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: «%s» %d нових підписів\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: «%s» 1 новий підключ\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: «%s» %d нових підключів\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підпис\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підписів\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікатор користувача\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікаторів користувачів\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: «%s» не змінено\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: імпортовано закритий ключ\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "ключ %s: закритий ключ вже існує\n"
- #: g10/import.c:1562
++#: g10/import.c:1575
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: помилка під час спроби надсилання агенту: %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, c-format
msgid "secret key %s: %s\n"
msgstr "закритий ключ %s: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "імпортування закритих ключів заборонено\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"ключ %s: немає відкритого ключа — не можна застосовувати сертифікат "
"відкликання\n"
- #: g10/import.c:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: імпортовано сертифікат відкликання «%s»\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: немає ідентифікатор користувача для підпису\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: непідтримуваний алгоритм створення відкритого ключа для "
"ідентифікатора користувача «%s»\n"
- #: g10/import.c:1979
++#: g10/import.c:2021
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: некоректний самопідпис для ідентифікатора користувача «%s»\n"
- #: g10/import.c:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: некоректний безпосередній підпис ключа\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: немає підключа для зв’язування ключів\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: некоректне зв’язування підключів\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: вилучено кратне зв’язування підключів\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: немає підключа для відкликання ключа\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: некоректне відкликання підключа\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: вилучено кратне відкликання підключа\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущено ідентифікатор користувача «%s»\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущено підключ\n"
- #: g10/import.c:2187
++#: g10/import.c:2229
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: непридатний до експорту підпис (клас 0x%02X) — пропущено\n"
- #: g10/import.c:2198
++#: g10/import.c:2240
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертифікат відкликання у помилковому місці — пропущено\n"
- #: g10/import.c:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — пропущено\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: підпис підключа у помилковому місці — пропущено\n"
- #: g10/import.c:2238
++#: g10/import.c:2280
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неочікуваний клас підпису (0x%02X) — пропущено\n"
- #: g10/import.c:2367
++#: g10/import.c:2409
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "УВАГА: ключ %s могло бути відкликано: отримуємо ключ відкликання %s\n"
- #: g10/import.c:2447
++#: g10/import.c:2489
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "УВАГА: ключ %s могло бути відкликано: ключа відкликання %s немає.\n"
- #: g10/import.c:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: додано сертифікат відкликання «%s»\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: додано безпосередній підпис ключа\n"
@@@ -3527,61 -2829,53 +3624,67 @@@ msgstr "створено сховищ�
msgid "keyring '%s' created\n"
msgstr "створено сховище ключів «%s»\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "ресурс блоку ключів «%s»: %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening '%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "помилка під час відкриття «%s»: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "не вдалося перебудувати кеш сховища ключів: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[відкликання]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[самопідпис]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 помилковий підпис\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d помилкових підписів\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "1 підпис не перевірено через те, що немає ключа\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d підписів не перевірено через те, що немає ключів\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "1 підпис не перевірено через помилку\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d підписів не перевірено через помилки\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "виявлено 1 ідентифікатор користувача без коректного самопідпису\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3592,17 -2886,14 +3695,17 @@@ msgstr "
"ключів інших\n"
"користувачів (за паспортами, відбитками з інших джерел тощо)\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Я довіряю не повністю\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Я довіряю повністю\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3612,47 -2903,40 +3715,52 @@@ msgstr "
"Глибина, більша за 1, дозволяє ключу, який ви підписуєте, створювати\n"
"надійні підписи від вашого імені.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Будь ласка, вкажіть домен обмеження цього підпису або натисніть Enter, якщо "
"такого домену немає.\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Ідентифікатор користувача «%s» відкликано."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Ви певні, що все ще бажаєте підписати його? (y/N або т/Н) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " Неможливо підписати.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Строк дії ідентифікатор користувача «%s» сплив."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Ідентифікатор користувача «%s» не є самопідписаним."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Ідентифікатор користувача «%s» можна підписувати. "
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "Підписати його? (y/N або т/Н) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3661,12 -2945,10 +3769,12 @@@ msgstr "
"Самопідпис «%s»\n"
"є підписом у форматі PGP 2.x.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
"Бажаєте розширити сферу використання до самопідпису OpenPGP? (y/N або т/Н) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3675,11 -2957,9 +3783,11 @@@ msgstr "
"Строк дії вашого поточного підпису «%s»\n"
"завершено.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Бажаєте видати новий підпис для заміни застарілого? (y/N або т/Н) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3688,45 -2968,36 +3796,45 @@@ msgstr "
"Ваш поточний підпис «%s»\n"
"є локальним підписом.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Бажаєте розширити сферу використання до повністю експортованого підпису? (y/"
"N або т/Н) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "«%s» вже було локально підписано ключем %s\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "«%s» вже було підписано ключем %s\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Бажаєте підписати його попри все? (y/N або т/Н) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Нічого підписувати ключем %s\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "Строк дії цього ключа вичерпано!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Строк дії цього ключа завершиться %s.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Бажаєте, щоб строк дії вашого підпису був таким самим? (Y/n або Т/н) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3737,267 -3008,204 +3845,265 @@@ msgstr "
"справді належить особі, ім’я якої вказано вище? Якщо ви не знаєте відповіді, "
"введіть «0».\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Не буду відповідати.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Мною не виконувалося ніяких перевірок.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Мною виконано часткову перевірку.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Мною виконано ретельну перевірку.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
msgid "Your selection? (enter '?' for more information): "
msgstr "Ваш вибір? (введіть «?», щоб дізнатися більше): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
"key \"%s\" (%s)\n"
msgstr "Ви справді бажаєте підписати цей ключ вашим ключем «%s» (%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "Це буде самопідпис.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "УВАГА: підпис не буде позначено як непридатний до експортування.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "УВАГА: підпис не буде позначено як непридатний до відкликання.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "Підпис буде позначено як непридатний до експортування.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "Підпис буде позначено як непридатний до відкликання.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "Цей ключ не перевірявся мною.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "Цей ключ перевірено мною частково.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "Цей ключ ретельно перевірено мною.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "Підписати? (y/N або т/Н) "
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "помилка під час спроби підписування: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"До ключа включено лише типовий заповнювач або записи ключа з картки — ніяких "
"паролів не потрібно змінювати.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "ключ %s: помилка під час спроби зміни пароля: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "пересування підпису ключа у належне місце\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "зберегти і вийти"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "показати відбиток ключа"
- #: g10/keyedit.c:1362
- #, fuzzy
- #| msgid "Enter the keygrip: "
++#: g10/keyedit.c:1373
msgid "show the keygrip"
- msgstr "Вкажіть keygrip: "
+ msgstr "показати keygrip"
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "показати список ключів та ідентифікаторів користувача"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "вибрати вказаний ідентифікатор користувача"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "вибрати вказаний підключ"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "перевірити підписи"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"підписати вибрані ідентифікатори користувачів [* нижче наведено відповідні "
"команди]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "підписати вибрані ідентифікатори користувача локально"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "підписати вибрані ідентифікатори користувача підписом надійності"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
"підписати вибрані ідентифікатори користувача підписом, який не можна "
"відкликати"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "додати ідентифікатор користувача"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "додати фотоідентифікатор"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "вилучити вибрані ідентифікатори користувача"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "додати підключ"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "додати ключ на картку пам’яті"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "пересунути ключ на картку пам’яті"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "пересунути резервний ключ на картку пам’яті"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "вилучити вибрані підключі"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "додати ключ відкликання"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "вилучити підписи з вибраних ідентифікаторів користувача"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "змінити дату завершення строку дії ключа або вибраних ключів"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "позначити вибраний ідентифікатор користувача як основний"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "список переваг (експертний)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "список переваг (докладний)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "встановити список параметрів для вибраних ідентифікаторів користувачів"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"встановити адресу основного сервера ключів для вибраних ідентифікаторів "
"користувачів"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "встановити примітку для вибраного ідентифікатора користувача"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "змінити пароль"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "змінити рівень довіри до власника"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "відкликати підписи для вибраних ідентифікаторів користувачів"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "відкликати вибрані ідентифікатори користувачів"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "відкликати ключ або вибрані підключі"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "увімкнути ключ"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "вимкнути ключ"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "показати вибрані фотоідентифікатори"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
"невикористані підписи з ключа"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
"всі підписи з ключа"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "Доступний закритий ключ.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "Для цього потрібен закритий ключ.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4008,249 -3216,193 +4114,250 @@@ msgstr "
" «t» для надійних підписів (tsign), «nr» для підписів без відкликання\n"
" (nrsign) або будь-яку комбінацію (ltsign, tnrsign тощо).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "Ключ відкликано."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "Підказка: виберіть ідентифікатори користувача для підписування\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Невідомий тип підпису «%s»\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Цією командою не можна користуватися у режимі %s.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "Вам слід вибрати принаймні один ідентифікатор користувача.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
- msgstr ""
+ msgstr "(Скористайтеся командою «%s».)\n"
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Вилучити всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "Вилучити цей ідентифікатор користувача? (y/N або т/Н) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "Вилучити основний ключ? (y/N або т/Н) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "Вам слід вибрати лише один ключ.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "Для команди слід вказати аргумент з назвою файла\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Не вдалося відкрити «%s»: %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Помилка читання резервного ключа з «%s»: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "Вам слід вибрати принаймні один ключ.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/Н) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "Справді бажаєте вилучити цей ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Відкликати всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "Відкликати цей ідентифікатор користувача? (y/N або т/Н) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Ви справді бажаєте відкликати весь ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Ви справді бажаєте відкликати позначені підключі? (y/N або т/Н) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Ви справді бажаєте відкликати цей підключ? (y/N або т/Н) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Не можна встановлювати довіру до власника, якщо використовується вказана "
"користувачем база даних довіри\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "Встановити список переваг:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Оновити переваги для вибраних ідентифікаторів користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "Оновити параметри? (y/N або т/Н) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "Зберегти зміни? (y/N або т/Н) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "Вийти без збереження? (y/N або т/Н) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "помилка оновлення: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не змінено, отже оновлення непотрібне.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "закритий ключ «%s» не знайдено: %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "«%s» не є відбитком\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "«%s» не є основним відбитком\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "No matching user IDs."
msgstr "Немає відповідних ідентифікаторів користувачів."
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "Nothing to sign.\n"
msgstr "Нічого підписувати.\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "Контрольна сума: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "Можливості: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "Сервер ключів без можливості зміни"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Основний сервер ключів: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "Примітки: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
"Переваг для ідентифікаторів користувачів у форматі PGP 2.x не передбачено.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Цей ключ може бути відкликано %s ключем %s"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(важливий)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "створено: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "відкликано: %s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "не діє з: %s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "діє до: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "використання: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "номер картки: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "надійність: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "чинність: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "Цей ключ було вимкнено"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4258,17 -3410,12 +4365,17 @@@ msgstr "
"Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
"до перезапуску програми.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "відкликано"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "збіг строк дії"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4278,15 -3425,12 +4385,15 @@@ msgstr "
" цієї команди можна зробити основним інший ідентифікатор "
"користувача.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
msgid "You may want to change its expiration date too.\n"
msgstr "Ймовірно, вам варто змінити також і його строк дії.\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4296,78 -3440,61 +4403,78 @@@ msgstr "
"до відмови\n"
" у використанні цього ключа деякими версіями PGP.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Ви справді бажаєте додати його? (y/N або т/Н) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "Вилучити цей дійсний підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Вилучити цей некоректний підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Вилучити цей невідомий підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "Вилучити цей самопідпис? (y/N або т/Н)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Вилучено %d підпис.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Вилучено %d підписів.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "Нічого не вилучено.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "некоректний"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Ідентифікатор користувача «%s» ущільнено: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Ідентифікатор користувача «%s»: вже мінімізовано\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Ідентифікатор користувача «%s»: вже очищено\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4377,190 -3504,161 +4484,203 @@@ msgstr "
"призвести до відмови\n"
" у використанні цього ключа деякими версіями PGP.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Не можна додавати підписане відкликання до ключа у форматі PGP 2.x.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "Вкажіть ідентифікатор користувача підписаного відкликання: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "не можна призначати ключ у форматі PGP 2.x підписаним відкликанням\n"
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "не можна призначати ключ власним підписаним відкликанням\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "цей ключ вже було позначено як призначений для відкликання\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"УВАГА: призначення ключа як підписаного відкликання не можна скасовувати!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
"Н) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "Будь ласка, виберіть не більше одного ключа.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr ""
+ "Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
+ "Н) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "Зміна часу завершення строку дії для підключа.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "Зміна часу завершення строку дії для основного ключа.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Не можна змінювати дату завершення строку дії ключа v3\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "підписування підключа %s вже перехресно сертифіковано\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"підключ %s не призначено для підписування, отже його не потрібно перехресно "
"сертифікувати\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "Будь ласка, виберіть лише один ідентифікатор користувача.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропускаємо самопідпис v3 для ідентифікатора користувача «%s»\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "Вкажіть адресу вашого основного сервера ключів: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Ви справді бажаєте замінити його? (y/N або т/Н) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Ви справді бажаєте вилучити його? (y/N або т/Н) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "Вкажіть примітку: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "Продовжувати? (y/N або т/Н) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ідентифікатора користувача з індексом %d не існує\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ідентифікатора користувача з хешем %s не існує\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "Підключа з індексом %d не існує\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "Підключа з індексом %d не існує\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Ідентифікатор користувача: «%s»\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "підписано вашим ключем %s %s%s%s\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (неекспортовний)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Строк дії цього підпису завершується %s.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Ви справді бажаєте відкликати його? (y/N або т/Н) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Створити сертифікат відкликання для цього підпису? (y/N або т/Н) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "Не підписано вами.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Вами підписано ці ідентифікатори користувачів у ключі %s:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (невідкликуваний)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "відкликано вашим ключем %s у %s\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "Ви маєте намір відкликати ці підписи:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "Справді створити сертифікати відкликання? (y/N або т/Н) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "немає закритого ключа\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ідентифікатор користувача «%s» вже відкликано\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"УВАГА: підпис ідентифікатора користувача позначено датою на %d секунд у "
"майбутньому\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Ключ %s вже відкликано.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Підключ %s вже відкликано.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ фотоідентифікатора %s розміру %ld для ключа %s (uid %d)\n"
@@@ -4599,14 -3689,10 +4719,14 @@@ msgstr "записування само
msgid "writing key binding signature\n"
msgstr "записування підпису прив’язування ключа\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "некоректний розмір ключа; використовуємо %u-бітовий\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "розмір ключа округлено до %u-бітового\n"
@@@ -4899,40 -3936,35 +5019,45 @@@ msgstr "
msgid "Real name: "
msgstr "Справжнє ім’я: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "Некоректний символ у імені\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "Ім’я не може починатися з цифри\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "Ім’я має бути не коротшим за 5 літер\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "Адреса ел. пошти: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "Некоректна адреса електронної пошти\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "Коментар: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "Некоректний символ у коментарі\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Вами використано таблицю символів «%s».\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4943,7 -3975,6 +5068,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Будь ласка, не використовуйте адресу електронної пошти у полях справжнього "
@@@ -4960,32 -3991,25 +5085,32 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "Спочатку виправте помилку\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -4993,7 -4017,6 +5118,7 @@@ msgstr "
"Вам потрібен пароль для захисту вашого закритого ключа.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@@ -5001,16 -4024,13 +5126,16 @@@ msgstr "
"Будь ласка, вкажіть пароль для захисту позакарткової резервної копії нового "
"ключа шифрування."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "помилка під час повторного введення пароля, повторіть спробу"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5022,7 -4042,6 +5147,7 @@@ msgstr "
"за допомогою цієї програми з параметром «--edit-key».\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5034,12 -4053,10 +5159,12 @@@ msgstr "
"під час створення простого числа. Це надасть змогу генератору\n"
"псевдовипадкових чисел створити краще випадкове число.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Помилка під час спроби створення ключа: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5050,54 -4067,43 +5175,54 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr "Продовжити? (Y (так)/n (ні)) "
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ключ для «%s» вже існує\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
msgid "Create anyway? (y/N) "
msgstr "Створити попри це? (y (так)/N (ні)) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
msgid "creating anyway\n"
msgstr "створюємо попри усе\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Зауваження: скористайтеся «%s %s», щоб викликати повноцінне діалогове вікно "
"створення ключа.\n"
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "Створення ключа скасовано.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, c-format
msgid "writing public key to '%s'\n"
msgstr "записуємо відкритий ключ до «%s»\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "не знайдено придатного до запису сховища відкритих ключів: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "відкритий і закритий ключі створено і підписано.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -5105,7 -4111,6 +5230,7 @@@ msgstr "
"Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
"скористатися командою «--edit-key» для створення підключа з цією метою.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5113,7 -4118,6 +5238,7 @@@ msgstr "
"ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
"проблема з годинником)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5121,240 -4125,185 +5246,237 @@@ msgstr "
"ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "Закриті частини основного ключа недоступні.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Закриті частини основного ключа зберігаються на картці.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "Створити? (y/N або т/Н) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "спроба зберігання ключа на картці зазнала невдачі: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "ніколи "
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Критичні правила підпису: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Правила підпису: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Критичний основний сервер ключів: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Критична примітка підпису: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Примітка підпису: "
- #: g10/keylist.c:446
- #, fuzzy
- #| msgid "1 bad signature\n"
++#: g10/keylist.c:468
msgid "1 good signature\n"
- msgstr "1 помилковий підпис\n"
+ msgstr "1 добрий підпис\n"
- #: g10/keylist.c:448
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
++#: g10/keylist.c:470
+ #, c-format
msgid "%d good signatures\n"
- msgstr "%d помилкових підписів\n"
+ msgstr "%d добрих підписів\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr "Попередження: %lu ключів пропущено через їхній надто великий розмір\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "Сховище ключів"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "пропущено «%s»: %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "Основний відбиток ключа:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " Відбиток підключа:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr "Відбиток основного ключа:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " Відбиток підключа:"
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " Відбиток ключа ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr "Серійний номер картки ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "спроба перейменування «%s» на «%s» зазнала невдачі: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, c-format
msgid "caching keyring '%s'\n"
msgstr "кешування сховища ключів «%s»\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "зараз кешовано %lu ключів (%lu підписів)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "кешовано %lu ключів (%lu підписів)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: створено сховище ключів\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
- msgstr ""
+ msgstr "перевизначити параметри проксі, встановлені для dirmngr"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "включити до результатів пошуку відкликані ключі"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "включити підключі до пошуку за ідентифікатором ключа"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
- msgstr ""
+ msgstr "перевизначити параметри часу очікування, встановлені для dirmngr"
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "автоматично отримувати ключі під час перевірки підписів"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "брати до уваги адресу основного сервера ключів, встановлену у ключі"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
"брати до уваги запис PKA, встановлений у ключі під час отримання ключів"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "вимкнено"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Вкажіть номер, далі (N) чи вийти (Q) > "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "некоректний протокол сервера ключів (наш %d!=%d обробника)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "«%s» не є ідентифікатором ключа: пропускаємо\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "оновлюємо 1 ключ з %s\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "УВАГА: не вдалося оновити ключ %s за допомогою %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "оновлюємо %d ключів з %s\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "ключ «%s» не знайдено на сервері ключів\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "ключ не знайдено на сервері ключів\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
"не вказано жодного сервера ключів (скористайтеся параметром --keyserver)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "надсилаємо запит щодо ключа %s до %s сервера %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "надсилаємо запит щодо ключа %s з %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "надсилаємо ключ %s до %s сервера %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "надсилаємо ключ %s на %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, c-format
msgid "requesting key from '%s'\n"
msgstr "надсилаємо запит щодо ключа з «%s»\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "УВАГА: не вдалося отримати адресу %s: %s\n"
@@@ -5392,7 -4335,6 +5514,7 @@@ msgstr "
"зашифровано за допомогою %u-бітового %s ключа, ідентифікатор %s, створено "
"%s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " «%s»\n"
@@@ -5438,254 -4371,203 +5560,255 @@@ msgstr "розшифровано\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "УВАГА: зашифроване повідомлення було змінено!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "текстовий пароль кешовано з ідентифікатором: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "невдала спроба розшифрування: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "ЗАУВАЖЕННЯ: вимога відправника: «лише для Вас»\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "початкова назва файла=«%.*s»\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "УВАГА: виявлено декілька фрагментів нешифрованого тексту\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"окреме відкликання — скористайтеся командою «gpg --import» для застосування\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "підпису не знайдено\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПОМИЛКОВИЙ підпис від «%s»"
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Прострочений підпис від «%s»"
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "Належний підпис від «%s»"
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "перевірку підписів придушено\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "не вдалося обробити ці дані з неоднозначним підписом\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "Підпис створено %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " за допомогою %s ключа %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
- #: g10/mainproc.c:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "Ключ доступний на: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[непевний]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " або «%s»"
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "Строк дії підпису вичерпано %s\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "Підпис діє до %s\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s підпис, алгоритм контрольної суми %s%s%s\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "двійковий"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "текстовий"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "невідомо"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "УВАГА: не відє’днаний підпис; файл «%s» не було перевірено!\n"
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не вдалося перевірити підпис: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "не є від’єднаним підписом\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "УВАГА: виявлено кратні підписи. Буде перевірено лише перший.\n"
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "окремий підпис класу 0x%02x\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "підпис у застарілому форматі (PGP 2.x)\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "помилка fstat щодо «%s» у %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "помилка fstat(%d) у %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr ""
"УВАГА: використовуємо експериментальний алгоритм створення відкритого ключа "
"%s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"УВАГА: ключі підписування і шифрування Elgamal вважаються застарілими\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "УВАГА: використовуємо експериментальний алгоритм шифрування %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr ""
"УВАГА: використовуємо експериментальний алгоритм обчислення контрольних сум "
"%s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "УВАГА: алгоритм обчислення контрольних сум %s вважається застарілим\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Зауваження: підписи за допомогою алгоритму %s відкинуто\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: застарілий параметр «%s»\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "УВАГА: «%s» вважається застарілим параметром\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "будь ласка, скористайтеся «%s%s»\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "УВАГА: «%s» вважається застарілою командою — не користуйтеся нею\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: «%s» є застарілим у цьому файлі — він працює лише у %s\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr ""
"УВАГА: «%s%s» є застарілим параметром — він не працюватиме, окрім як на %s\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "Нестиснений"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "uncompressed|немає"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "використання цього повідомлення щодо %s може бути неможливим\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "неоднозначний параметр «%s»\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, c-format
msgid "unknown option '%s'\n"
msgstr "невідомий параметр «%s»\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"Відкритий ключ ECDSA має зберігатися у кодуванні SEC кратному 8-бітовому\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type '%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "Невідомий тип підпису «%s»\n"
+
+#: g10/openfile.c:85
#, c-format
msgid "File '%s' exists. "
msgstr "Файл «%s» існує. "
@@@ -5874,31 -4723,24 +5997,31 @@@ msgstr "Це потрібна вам ф
msgid "unable to display photo ID!\n"
msgstr "показ фотоідентифікатора неможливий!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "Причину не вказано"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "Ключ замінено"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "Ключ скомпрометовано"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "Ключ більше не використовується"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "Ідентифікатор користувача втратив чинність"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "причина відкликання: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "коментар щодо відкликання: "
@@@ -5912,54 -4754,43 +6035,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "Не вказано значення довіри до:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " або «%s»\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"Наскільки ви певні, що цей ключ справді належить користувачеві з вказаним "
"іменем?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = не знаю або не скажу\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = НЕ довіряю\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = довіряю без обмежень\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = повернутися до головного меню\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = пропустити цей ключ\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " q = вийти\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -5968,42 -4799,34 +6091,42 @@@ msgstr "
"Мінімальним рівнем довіри до цього ключа є %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "Ваше рішення? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr ""
"Ви справді хочете встановити необмежену довіру до цього ключа? (y/N або т/Н) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Сертифікати, що призводять до необмеженої довіри до ключа:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: немає певності щодо належності цього ключа користувачеві з вказаним "
"іменем\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: є певні свідчення належності цього ключа користувачеві з вказаним "
"іменем\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "Ймовірно, цей ключ належить користувачеві з вказаним іменем\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "Цей ключ належить нам\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6014,111 -4837,86 +6137,111 @@@ msgstr "
"відомі наслідки ваших дій, можете ствердно відповісти\n"
"на наступне питання.\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "Попри все використовувати цей ключ? (y/N або т/Н) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "УВАГА: використовуємо ненадійний ключ!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "УВАГА: цей ключ могло бути відкликано (немає ключа відкликання)\n"
- #: g10/pkclist.c:546
++#: g10/pkclist.c:547
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "УВАГА: цей ключ було відкликано відповідною особою!\n"
- #: g10/pkclist.c:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "УВАГА: цей ключ було відкликано власником!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " Це може означати, що підпис було підроблено.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "УВАГА: цей підключ було відкликано його власником!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "Зауваження: цей ключ було вимкнено.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Зауваження: перевіреною адресою автора підпису є «%s»\n"
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Зауваження: адреса автора підпису «%s» не збігається з записом DNS\n"
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "рівень довіри змінено на FULL (повна) через коректність даних PKA\n"
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "рівень довіри змінено на NEVER (ніколи) через помилки у даних PKA\n"
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "Зауваження: строк дії цього ключа вичерпано!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "УВАГА: цей ключ не сертифіковано за допомогою надійного підпису!\n"
- #: g10/pkclist.c:632
++#: g10/pkclist.c:633
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Немає підтверджень належності підпису його власнику.\n"
- #: g10/pkclist.c:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "УВАГА: ми НЕ довіряємо цьому ключу!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " Підпис, ймовірно, є ПІДРОБКОЮ.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "УВАГА: цей ключ не сертифіковано достатньо надійними підписами!\n"
- #: g10/pkclist.c:651
++#: g10/pkclist.c:652
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Певності у належності підпису його власнику немає.\n"
- #: g10/pkclist.c:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: відкритий ключ вимкнено\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: відкритий ключ вже існує\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Вами не вказано ідентифікатора користувача. (можете скористатися «-r»)\n"
- #: g10/pkclist.c:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "Поточні отримувачі:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6126,75 -4924,58 +6249,75 @@@ msgstr "
"\n"
"Вкажіть ідентифікатор користувача. Дані слід завершити порожнім рядком: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "Немає такого ідентифікатора користувача.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: відкритий ключ вже встановлено для типового отримувача\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "Відкритий ключ вимкнено.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "пропущено: відкритий ключ вже встановлено\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "невідомий типовий отримувач «%s»\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "немає коректних адрес\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Зауваження: у ключі %s не передбачено можливості %s\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Зауваження: у ключі %s не передбачено переваг для %s\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"дані не збережено; скористайтеся для їхнього збереження параметром «--"
"output»\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, c-format
msgid "error creating '%s': %s\n"
msgstr "помилка створення «%s»: %s.\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "Від’єднаний підпис.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "Будь ласка, вкажіть назву файла даних: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "читаємо дані з stdin...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "немає підписаних даних\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "не вдалося відкрити підписані дані «%s»\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "не вдалося відкрити підписані дані fd=%d: %s\n"
@@@ -6231,8 -5005,6 +6354,8 @@@ msgstr "ЗАУВАЖЕННЯ: стро�
msgid "Note: key has been revoked"
msgstr "ЗАУВАЖЕННЯ: ключ було відкликано"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "помилка build_packet: %s\n"
@@@ -6242,42 -5013,36 +6365,46 @@@
msgid "key %s has no user IDs\n"
msgstr "у ключа %s немає ідентифікатора користувача\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "Буде відкликано:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(Це критичний ключ відкликання)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ msgid "Secret key is not available.\n"
+ msgstr "Закритий ключ недоступний.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr ""
"Створити підписаний сертифікат відкликання для цього ключа? (y/N або т/Н) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "Призначено виведення у форматі ASCII.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "помилка make_keysig_packet: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "Створено сертифікат відкликання.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "для «%s» не знайдено ключів відкликання\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Це сертифікат відкликання для ключа OpenPGP:"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6289,7 -5054,6 +6416,7 @@@ msgstr "
"закритого ключа не втрачено, краще створити новий сертифікат\n"
"відкликання і вказати причину відкликання."
- #: g10/revoke.c:564
++#: g10/revoke.c:572
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"
@@@ -6299,11 -5063,21 +6426,25 @@@ msgstr "
"дефісами нижче додано двокрапку. Вилучіть цю двокрапку у текстовому\n"
"редакторі, перш ніж скористатися цим сертифікатом відкликання."
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "закритий ключ «%s» не знайдено: %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Створити сертифікат відкликання для цього ключа? (y/N або т/Н) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6323,33 -5097,26 +6464,33 @@@ msgstr "
"може зберігати дані друку, доступ до яких зможуть отримати\n"
"сторонні люди!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "Будь ласка, вкажіть причину відкликання:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "Скасувати"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Ймовірно, вам варто тут вибрати %d)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Вкажіть необов’язковий опис; завершіть його порожнім рядком:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Причина відкликання: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(Опису не надано)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "Все правильно? (y/N або т/Н) "
@@@ -6376,37 -5139,30 +6517,37 @@@ msgstr "
"Для використання %s ключа %s потрібен хеш з %zu або більше бітів (маємо хеш "
"%s)\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "УВАГА: конфлікт контрольних сум підписів у повідомленні\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "УВАГА: підписування підключа %s не є перехресно сертифікованим\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "будь ласка, ознайомтеся з %s, щоб дізнатися більше\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"УВАГА: підписування підключа %s містить некоректну перехресну сертифікацію\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "відкритий ключ %s є на %lu секунду новішим за підпис\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "відкритий ключ %s є на %lu секунд новішим за підпис\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6414,7 -5170,6 +6555,7 @@@ msgstr "
"ключ %s було створено з позначкою на %lu секунду у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@@ -6422,28 -5177,23 +6563,28 @@@ msgstr "
"ключ %s було створено з позначкою на %lu секунд у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "ЗАУВАЖЕННЯ: строк дії ключа підпису %s завершився %s\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "ЗАУВАЖЕННЯ: ключ підпису %s було відкликано\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"припускаємо помилковий підпису від ключа %s через невідомий критичний біт\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "ключ %s: немає підключа для підпису відкликання підключа\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "ключ %s: немає підключа для підпису прив’язування підключа\n"
@@@ -6489,33 -5233,27 +6630,33 @@@ msgstr "
msgid "signing:"
msgstr "підписування:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "Буде використано шифрування %s\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"ключ не було позначено як ненадійний — не можна використовувати його з "
"фіктивним RNG!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "пропущено «%s»: дублювання\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "пропущено: закритий ключ вже існує\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"це ключ Elgamal створений за допомогою PGP, цей ключ недостатньо безпечний "
"для підписування!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "запис щодо довіри %lu, тип %d: помилка записування: %s\n"
@@@ -6560,7 -5290,6 +6701,7 @@@ msgstr "не вдалося знайт�
msgid "read error in '%s': %s\n"
msgstr "помилка читання у «%s»: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: помилка синхронізації: %s\n"
@@@ -6589,7 -5313,6 +6730,7 @@@ msgstr "запис trustdb %lu: пом�
msgid "trustdb transaction too large\n"
msgstr "занадто велика операція trustdb\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "немає доступу до «%s»: %s\n"
@@@ -6704,114 -5404,91 +6845,114 @@@ msgstr "
msgid "input line longer than %d characters\n"
msgstr "рядок вхідних даних довший за %d символів\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "«%s» не є коректним довгим ідентифікатором ключа\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "ключ %s: прийнято як надійний ключ\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "ключ %s зустрічається у trustdb декілька разів\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "ключ %s: немає відкритого ключа для надійного ключа — пропущено\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "ключ %s позначено як ключ з необмеженою довірою\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "запис довіри %lu, тип запиту %d: помилка читання: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "запис довіри %lu не належить до вказаного типу %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "Ви можете спробувати повторно створити trustdb за допомогою команд:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
"Якщо результат буде незадовільним, будь ласка, зверніться до підручника\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"використання невідомої моделі довіри (%d) неможливе — припускаємо модель "
"довіри %s\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "використовуємо модель довіри %s\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "потреби у перевірці trustdb немає\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "наступну перевірку trustdb призначено на %s\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "потреби у перевірці trustdb на основі моделі довіри «%s» немає\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "потреби у оновленні trustdb на основі моделі довіри «%s» немає\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "відкритий ключ %s не знайдено: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "будь ласка, скористайтеся параметром --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "перевірка trustdb\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "Оброблено %d ключів (очищено %d значень чинності)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "не знайдено ключів з необмеженою довірою\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "потрібно %d обмежених, потрібно %d повних, модель довіри %s\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -6819,7 -5496,6 +6960,7 @@@ msgstr "
"глибина: %d чинність: %3d підписано: %3d надійність: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
@@@ -6852,13 -5523,9 +6993,11 @@@ msgstr "безмежна
#. 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:147
- #, fuzzy
- #| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgid "10 translator see trust.c:uid_trust_string_fixed"
- msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
+ msgstr "10"
+#: g10/trust.c:150
msgid "[ revoked]"
msgstr "[відклик.]"
@@@ -7067,11 -5692,9 +7206,11 @@@ msgstr "Пінкод для CHV%d за�
msgid "verify CHV%d failed: %s\n"
msgstr "помилка перевірки CHV%d: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "помилка отримання стану CHV з картки\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "картку заблоковано!\n"
@@@ -7204,12 -5799,10 +7343,12 @@@ msgstr "карткою не підтр�
msgid "signatures created so far: %lu\n"
msgstr "вже створено підписів: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "перевірку адміністративного пінкоду заборонено цією командою\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "не вдалося отримати доступ до %s — некоректна картка OpenPGP?\n"
@@@ -7229,7 -5819,6 +7368,7 @@@ msgstr "|N|Початковий нов�
msgid "run in multi server mode (foreground)"
msgstr "запустити у режимі декількох серверів (основному режимі)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|встановити вказаний рівень діагностики"
@@@ -7287,12 -5864,10 +7426,12 @@@ msgstr "
"будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
"фоновому режимі\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "запущено запуск обробки для дескриптора %d\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "роботу обробника для дескриптора %d перервано\n"
@@@ -7710,7 -6193,6 +7849,7 @@@ msgstr "
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "рядок %d: помилка створення ключа: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8296,7 -6658,6 +8435,7 @@@ msgstr "остаточно завант
msgid " runtime cached certificates: %u\n"
msgstr " динамічно кешовані сертифікати: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
msgid "certificate already cached\n"
msgstr "сертифікат вже кешовано\n"
@@@ -8304,8 -6664,6 +8443,8 @@@
msgid "certificate cached\n"
msgstr "сертифікат кешовано\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, c-format
msgid "error caching certificate: %s\n"
msgstr "помилка під час спроби кешування сертифіката: %s\n"
@@@ -8364,7 -6711,6 +8503,7 @@@ msgstr "вилучаємо файл к�
msgid "not removing file '%s'\n"
msgstr "не вилучаємо файл «%s»\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, c-format
msgid "error closing cache file: %s\n"
msgstr "помилка під час спроби закриття файла кешу: %s\n"
@@@ -8591,156 -6893,126 +8730,156 @@@ msgstr "серійний номер %s
msgid "error getting data from cache file: %s\n"
msgstr "помилка під час спроби отримання даних з файла кешу: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "невідомий алгоритм хешування «%s»\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr "помилка використання gcry_md_open для алгоритму %d: %s\n"
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr "отримано некоректний вираз S з libksba\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, c-format
msgid "converting S-expression failed: %s\n"
msgstr "спроба перетворення виразу S зазнала невдачі: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "спроба створення виразу S зазнала невдачі: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, c-format
msgid "ksba_crl_parse failed: %s\n"
msgstr "помилка ksba_crl_parse: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "помилка під час спроби отримання даних щодо часу оновлення з CRL: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr "часи оновлення цього CRL: поточне=%s наступне=%s\n"
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr "не вказано nextUpdate; вважаємо періодом чинності один день\n"
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, c-format
msgid "error getting CRL item: %s\n"
msgstr "помилка під час спроби отримання запису CRL: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr ""
"помилка під час спроби додавання пункту до файла тимчасового кешу: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "не виявлено видавця CRL у CRL: %s\n"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr "пошук видавця CRL сертифіката за authorityKeyIdentifier\n"
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, c-format
msgid "CRL signature verification failed: %s\n"
msgstr "помилка перевірки підпису CRL: %s\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr ""
"помилка під час спроби перевірки чинності сертифіката видавця CRL: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "помилка ksba_crl_new: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "помилка ksba_crl_set_reader: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "вилучено застарілий тимчасовий файл кешу «%s»\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr ""
"помилка під час спроби вилучення застарілого тимчасового файла кешу «%s»: "
"%s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "помилка під час спроби створення тимчасового файла кешу «%s»: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, c-format
msgid "crl_parse_insert failed: %s\n"
msgstr "помилка crl_parse_insert: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr ""
"помилка під час спроби завершення запису тимчасового файла кешу «%s»: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "помилка під час спроби закриття тимчасового файла кешу «%s»: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
"УВАГА: новий CRL все ще занадто старий; його строк дії завершується %s — "
"попри це завантажуємо\n"
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr "новий CRL все ще занадто старий; його строк дії завершується %s\n"
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr "невідомий критичний додаток CRL %s\n"
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "помилка під час читання додатків CRL: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, c-format
msgid "creating cache file '%s'\n"
msgstr "створюємо файл кешу «%s»\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "проблема під час перейменування «%s» на «%s»: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
@@@ -8748,12 -7020,10 +8887,12 @@@ msgstr "
"помилка під час спроби оновлення файла каталогу — запис кешу буде втрачено "
"під час наступного запуску програми\n"
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr "Початок дампу CRL (отримано за допомогою %s)\n"
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
@@@ -8761,53 -7031,42 +8900,53 @@@ msgstr "
" ПОМИЛКА: CRL не буде використано, оскільки він все ще застарілий після "
"оновлення!\n"
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr " ПОМИЛКА: CRL не буде використано через невідомий критичний додаток!\n"
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr " ПОМИЛКА: CRL не буде використано\n"
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr " ПОМИЛКА: цей кешований CRL можливо було підроблено!\n"
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
msgid " WARNING: invalid cache record length\n"
msgstr " УВАГА: некоректна довжина запису кешу\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, c-format
msgid "problem reading cache record: %s\n"
msgstr "проблема під час читання запису кешу: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, c-format
msgid "problem reading cache key: %s\n"
msgstr "проблема під час спроби читання ключа кешу: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "помилка під час спроби читання запису кешу з бази даних: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr "Кінець дампу CRL\n"
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "помилка crl_fetch за DP: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "помилка crl_cache_insert за DP: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "помилка crl_cache_insert за видавцем: %s\n"
@@@ -8851,69 -7100,51 +8990,67 @@@ msgstr "помилка отриманн
msgid "error retrieving '%s': http status %u\n"
msgstr "помилка отримання «%s»: стан http %u\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
- #, fuzzy
- #| msgid "CRL access not possible due to disabled %s\n"
- msgid "CRL access not possible due to TOR mode\n"
- msgstr "Доступ до CRL неможливий через вимкнений %s\n"
+ msgid "CRL access not possible due to Tor mode\n"
+ msgstr "Доступ до CRL неможливий через увімкнений режим Tor\n"
+#: dirmngr/crlfetch.c:386
#, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "пошук сертифікатів неможливий через вимкнений %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr "використовувати OCSP замість CRL"
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr "перевірити, чи запущено dirmngr"
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
msgid "add a certificate to the cache"
msgstr "додати сертифікат до кешу"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
msgid "validate a certificate"
msgstr "перевірити сертифікат"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
msgid "lookup a certificate"
msgstr "шукати сертифікат"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
msgid "lookup only locally stored certificates"
msgstr "шукати лише локально збережені сертифікати"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr "очікувати адресу для --lookup"
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr "завантажити CRL до dirmngr"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr "особливий режим для використання Squid"
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
msgid "expect certificates in PEM format"
msgstr "сертифікати мало бути вказано у форматі PEM"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
msgstr "примусово використовувати типовий відповідач OCSP"
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
"Використання: dirmngr-client [параметри] [файл_сертифіката|шаблон] (-h — "
"довідка)\n"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -8925,216 -7156,143 +9062,187 @@@ msgstr "
"Процес повертає 0, якщо сертифікат є коректним, 1 якщо він не є\n"
"коректним, інші коди для загальних помилок.\n"
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "помилка під час спроби читання сертифіката з stdin: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "помилка під час спроби читання сертифіката з «%s»: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr "сертифікат занадто великий для використання\n"
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, c-format
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "не вдалося встановити з’єднання з dirmngr: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, c-format
msgid "lookup failed: %s\n"
msgstr "помилка пошуку: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "спроба завантаження CRL «%s» завершилася невдало: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr "фонову службу dirmngr запущено\n"
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "не вдалося перевірити сертифікат: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
msgid "certificate is valid\n"
msgstr "сертифікат є коректним\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
msgid "certificate has been revoked\n"
msgstr "сертифікат відкликано\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, c-format
msgid "certificate check failed: %s\n"
msgstr "помилка під час перевірки сертифіката: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr "отримано стан: «%s»\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "помилка під час спроби запису у кодуванні base64: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "не вдалося розмістити контекст assuan: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr "ймовірно, dirmngr не запущено\n"
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr "dirmngr не запущено — запускаємо\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr "помилкове форматування змінної середовища %s\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "підтримки протоколу dirmngr версії %d не передбачено\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
- "не вдалося встановити з’єднання з dirmngr — намагаємося скористатися "
- "резервним\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "не вдалося встановити з’єднання з dirmngr: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "непідтримуваний запит «%s»\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr "мало бути вказано абсолютний шлях до файла\n"
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr "пошук «%s»\n"
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr "запустити як службу windows (у фоновому режимі)"
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr "показати вміст кешу CRL"
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|отримати CRL з вказаної адреси"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr "завершити роботу dirmngr"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr "спорожнити кеш"
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|записувати журнал режиму сервера до файла"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
msgid "run without asking a user"
msgstr "запустити без запиту до користувача"
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr "примусове завантаження застарілих САС"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr "дозволити надсилання запитів OCSP"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr "заборонити використання HTTP"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr "заборонити використання LDAP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr "ігнорувати точки поширення САС протоколу HTTP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr "ігнорувати точки поширення САС протоколу LDAP"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr "ігнорувати адреси служб OCSP з сертифікатами"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|переспрямувати всі запити HTTP на вказану адресу"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|використовувати вказаний вузол для запитів LDAP"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "не використовувати резервні вузли з --ldap-proxy"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|прочитати список серверів LDAP з вказаного файла"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "додати виявлені у точках поширення CRL нові сервери до списку серверів"
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|встановити вказаний час очікування даних від LDAP"
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|використовувати відповідач OCSP за вказаною адресою"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|відповідь OCSP підписано FPR"
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr "|N|повертати не більше за вказану кількість записів на запит"
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|ФАЙЛ|використовувати сертифікати CA з файла ФАЙЛ для HKP крізь TLS"
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
- msgstr ""
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
+ msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9144,11 -7302,9 +9252,11 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man) «info»)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Використання: @DIRMNGR@ [параметри] (-h — довідка)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9156,78 -7312,61 +9264,78 @@@ msgstr "
"Синтаксис: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
"Доступ до сервера ключів, CRL та OCSP для @GNUPG@\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "коректними рівнями зневаджування є: %s\n"
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, c-format
msgid "usage: %s [options] "
msgstr "використання: %s [параметри]"
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
msgid "colons are not allowed in the socket name\n"
msgstr "не можна використовувати двокрапки у назві сокета\n"
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "помилка під час обробки CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: занадто довгий рядок — пропущено\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: виявлено некоректний відбиток\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: помилка під час читання: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: беззмістовні дані наприкінці рядка проігноровано\n"
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
"отримано сигнал SIGHUP — повторне читання налаштувань та спорожнення кешу\n"
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr "отримано сигнал SIGUSR2 — дій не визначено\n"
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr "отримано сигнал SIGTERM — завершуємо роботу…\n"
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "отримано сигнал SIGTERM — підтримується %d активних з’єднань\n"
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
msgid "shutdown forced\n"
msgstr "примусове завершення роботи\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr "отримано сигнал SIGINT — негайне завершення роботи\n"
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "отримано сигнал %d — дій не визначено\n"
@@@ -9470,12 -7558,10 +9578,12 @@@ msgstr "додавання «%s:%d» д
msgid "malloc failed: %s\n"
msgstr "помилка malloc: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: некоректний шаблон «%s»\n"
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search перевищив обмеження розміру сервера\n"
@@@ -9507,13 -7587,9 +9615,11 @@@ msgstr "помилка під час с
msgid "response from server too large; limit is %d bytes\n"
msgstr "занадто об’ємна відповідь від сервера; верхня межа — %d байтів\n"
+#: dirmngr/ocsp.c:139
- #, fuzzy
- #| msgid "OCSP request not possible due to disabled HTTP\n"
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr "запит за допомогою OCSP неможливий через вимикання протоколу HTTP\n"
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "запит за допомогою OCSP неможливий через увімкнений режим Tor\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr "запит за допомогою OCSP неможливий через вимикання протоколу HTTP\n"
@@@ -9656,71 -7702,60 +9762,76 @@@ msgstr "Відповідачем OCSP �
msgid "OCSP responder returned an too old status\n"
msgstr "Відповідачем OCSP повернуто занадто застарілі дані щодо стану\n"
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "помилка assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr "не вказано ldapserver"
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr "у ідентифікаторі сертифіката немає серійного номера"
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "помилка assuan_inquire: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "помилка fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, c-format
msgid "error sending data: %s\n"
msgstr "помилка під час спроби надсилання даних: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "помилка start_cert_fetch: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "помилка fetch_next_cert: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "перевищено max_replies у %d\n"
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "не вдалося розмістити структуру керування: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "не вдалося розмістити контекст assuan: %s\n"
+
++#: dirmngr/server.c:2430
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "не вдалося ініціалізувати сервер: %s\n"
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема з прийняттям Assuan: %s\n"
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "помилка обробки за допомогою Assuan: %s\n"
@@@ -9968,13 -7943,9 +10079,11 @@@ msgstr "Параметри керува
msgid "Options controlling the interactivity and enforcement"
msgstr "Параметри керування інтерактивністю та примусом"
+#: tools/gpgconf-comp.c:911
- #, fuzzy
- #| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
- msgstr "Параметри керування захистом"
+ msgid "Options controlling the use of Tor"
+ msgstr "Параметри керування використанням Tor"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "Налаштування для серверів HTTP"
@@@ -10010,11 -7973,9 +10119,11 @@@ msgstr "Фонова служба ка�
msgid "GPG for S/MIME"
msgstr "GPG для S/MIME"
+#: tools/gpgconf-comp.c:1063
msgid "Key Acquirer"
- msgstr ""
+ msgstr "Засіб запиту ключів"
+#: tools/gpgconf-comp.c:1064
msgid "PIN and Passphrase Entry"
msgstr "Введення пінкодів і паролів"
diff --cc po/zh_CN.gmo
index 22e020a,0000000..e4f9c2a
mode 100644,000000..100644
Binary files differ
diff --cc po/zh_CN.po
index 29c781d,f2793db..4ea0afa
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2009-07-09 10:03+0200\n"
"Last-Translator: Meng Jie <zuxyhere at eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@@ -73,7 -62,6 +73,7 @@@ msgstr "无效的密码
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
#, fuzzy
msgid "Quality:"
msgstr "有效性：%s"
@@@ -84,75 -72,59 +84,75 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "错误的密码"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr ""
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
#, fuzzy
msgid "PIN too long"
msgstr "列太长"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
#, fuzzy
msgid "Passphrase too long"
msgstr "列太长"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "姓名含有无效的字符\n"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr ""
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad PIN"
msgstr "损坏的多精度整数(MPI)"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
#, fuzzy
msgid "Bad Passphrase"
msgstr "错误的密码"
@@@ -162,25 -133,11 +162,25 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, 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:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -253,14 -197,12 +253,14 @@@ msgstr "请输入密码：这是一个�
msgid "failed to create stream from socket: %s\n"
msgstr "%s：建立散列表失败：%s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
#, fuzzy
msgid "Please insert the card with serial number"
msgstr ""
"请取出当前的卡，并插入有下列序列号的卡：\n"
" %.*s\n"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
#, fuzzy
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -406,42 -322,28 +406,42 @@@ msgstr "
"选项：\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "详细模式"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
@@@ -525,11 -410,6 +525,11 @@@ msgstr "未被支持
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"请向 <@EMAIL@> 报告程序缺陷。\n"
@@@ -546,146 -424,108 +546,145 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, 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:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "配置文件‘%s’：%s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, 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:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’：%s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
- #: agent/gpg-agent.c:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败：%s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "正在将私钥写至`%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 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:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "已创建目录‘%s’\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错：%s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "无法建立目录‘%s’：%s\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "更新私钥失败：%s\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s：已跳过：%s\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -701,8 -539,6 +700,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -710,9 -546,6 +709,9 @@@ msgstr "
"@指令：\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -766,7 -591,6 +765,7 @@@ msgstr "已取消
msgid "error while asking for the passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
@@@ -951,8 -741,6 +950,8 @@@ msgstr "生成密码的时候发生错�
msgid "error creating a stream for a pipe: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -1103,7 -859,6 +1102,7 @@@ msgstr "
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr ""
@@@ -1123,7 -875,6 +1122,7 @@@ msgstr "
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1418,7 -1109,6 +1417,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "可选"
@@@ -1596,19 -1248,14 +1595,19 @@@ msgstr "
msgid "Enter passphrase: "
msgstr "请输入密码："
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP 卡不可用：%s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@@ -1622,210 -1267,159 +1621,210 @@@ msgstr "在 %s 模式中不允许使用
msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "您的选择？ "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[未设定]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "男性"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "女性"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "未定义"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "可选"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "必须"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "错误：目前只允许使用 ASCII 字符。\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "错误：不能使用字符“<”。\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "错误：不允许出现两个空格。\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "卡持有人的姓："
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "卡持有人的名："
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "获取公钥的 URL："
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误：URL 太长(至多 %d 个字符)\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "登录数据(帐号名)："
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "个人 DO 数据："
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "首选语言："
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "错误：首选项字符串长度无效。\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "错误：首选项字符串里有无效字符。\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "错误：无效的响应。\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "CA 指纹："
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "错误：指纹格式无效。\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "针对密钥的操作无法实现：%s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "不是一个 OpenPGP 卡"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "替换已有的密钥？(y/N)"
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "私钥已存储在卡上\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "替换已有的密钥？(y/N)"
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1840,143 -1434,108 +1839,143 @@@ msgstr "
" PIN = ‘%s’ 管理员 PIN = ‘%s’\n"
"您应当使用 --change-pin 命令来更改它们\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "请选择您要使用的密钥种类：\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) 签名密钥\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) 加密密钥\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "请选择在哪里存储密钥：\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "更新失败：%s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "私钥已存储在卡上\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "为其添加签名吗？(y/N)"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "离开这个菜单"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "显示管理员命令"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "显示这份在线说明"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "列出所有可用数据"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "更改卡持有人的姓名"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "更改获取密钥的 URL"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "根据卡中指定的 URL 获取密钥"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "更改登录名"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "更改首选语言首选"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "更改卡持有人的性别"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "更改一个 CA 指纹"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "设定 PIN 签名是否必须"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "生成新的密钥"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "更改或解锁 PIN 的菜单"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "验证 PIN 并列出所有数据"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "仅供管理员使用的命令\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "允许使用管理员命令\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
@@@ -1984,77 -1542,64 +1983,84 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "无法打开‘%s’\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到：%s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "读取密钥区块时发生错误：%s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "密钥‘%s’找不到：%s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(除非您用指纹指定密钥)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "在批处理模式中，没有“--yes”就无法这么做\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "要从钥匙环里删除这把密钥吗？(y/N)"
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "这是一把私钥！――真的要删除吗？(y/N)"
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "bad key"
msgid "key"
msgstr "密钥已损坏"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "公钥："
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "信任度信息已被清除\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "公钥“%s”有对应的私钥！\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
@@@ -2104,7 -1641,6 +2110,7 @@@ msgstr "警告：强行使用的 %s (%d
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "您不该将 %s 用于 %s 模式中\n"
@@@ -2188,281 -1708,234 +2194,301 @@@ msgstr "警告：无法删除临时文�
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "警告：无法删除临时目录‘%s’：%s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "导出被标记为局部的密名"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "导出属性用户标识(一般为照片标识)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "导出被标记为“敏感”的吊销密钥"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "导出时清除密钥中的不可用部分"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "导出时尽可能清除密钥中的可选部分"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "不允许导出私钥\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "密钥 %s：密钥在卡上——已跳过\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s：已跳过：%s\n"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "警告：没有导出任何东西\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "自动获取‘%s’，通过 %s\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "建立‘%s’时发生错误：%s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
#, fuzzy
msgid "No fingerprint"
msgstr "CA 指纹："
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "找不到私钥“%s”：%s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ msgid "(check argument of option '%s')\n"
+ msgstr "无效的列表选项\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "unusable secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "不可用的私钥"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
#, fuzzy
msgid "make a signature"
msgstr "|[文件名]|生成一份签名"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
#, fuzzy
msgid "make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "生成一份分离的签名"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "加密数据"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "验证签名"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "列出密钥"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "列出密钥和签名"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "列出私钥"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "导出密钥"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "导入/合并密钥"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "打印卡状态"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "更改卡上的数据"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "更新信任度数据库"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
#, fuzzy
msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "不做任何改变"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2470,7 -1943,6 +2496,7 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2490,13 -1962,11 +2516,13 @@@ msgstr "
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2511,7 -1981,6 +2537,7 @@@ msgstr "
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2519,80 -1988,65 +2545,80 @@@ msgstr "
"\n"
"支持的算法：\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "公钥："
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "对称加密："
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "散列："
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "压缩："
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法：gpg [选项] "
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, 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:1489
++#: g10/gpg.c:1505
#, 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:1492
++#: g10/gpg.c:1508
#, 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:1495
++#: g10/gpg.c:1511
#, 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:1501
++#: g10/gpg.c:1517
#, 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:1504
++#: g10/gpg.c:1520
#, 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:1507
++#: g10/gpg.c:1523
#, 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:1513
++#: g10/gpg.c:1529
#, 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:1516
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2600,19 -2054,16 +2626,19 @@@ msgid "
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, 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:1525
++#: g10/gpg.c:1541
#, 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:1528
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2621,492 -2072,437 +2647,558 @@@ msgid "
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, 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:1738
++#: g10/gpg.c:1754
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "未知的配置项‘%s’\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ msgid "available TOFU policies:\n"
+ msgstr "禁用密钥"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option `%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "未知的选项 '%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "未知的选项 '%s'\n"
+
++#: g10/gpg.c:2085
#, 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:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, c-format
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr ""
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring `%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "注意：一般情况下不会用到 %s！\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, 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:2779
++#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, 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:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s：%d：无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, 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:3497
++#: g10/gpg.c:3868
#, 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:3502
++#: g10/gpg.c:3873
#, 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:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
- #: g10/gpg.c:3662
++#: g10/gpg.c:4047
+ #, fuzzy, c-format
+ msgid "option '%s' given, but no valid default keys given\n"
+ msgstr "无效的‘%s’散列算法\n"
+
++#: g10/gpg.c:4050
+ #, fuzzy, c-format
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "无效的‘%s’散列算法\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [文件名]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, 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:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [文件名]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
- #: g10/gpg.c:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key 用户标识"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, fuzzy, c-format
+ msgid "error parsing key specification '%s': %s\n"
+ msgstr "取得当前密钥信息时出错：%s\n"
+
++#: g10/gpg.c:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[文件名]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
#, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
msgstr "从这个钥匙环里取用密钥"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "把时间戳矛盾仅视为警告"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|FD|把状态信息写入文件描述符 FD"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
#, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
@@@ -3281,7 -2643,6 +3373,7 @@@ msgstr "以避免可能的算法不匹�
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:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s：没有用户标识\n"
@@@ -3292,7 -2652,6 +3384,7 @@@
msgid "key %s: %s\n"
msgstr "“%s”已跳过：%s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr ""
@@@ -3315,7 -2670,6 +3407,7 @@@ msgstr "密钥 %s：没有有效的用�
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签名所致\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s：找不到公钥：%s\n"
@@@ -3325,206 -2678,179 +3417,221 @@@
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s：新密钥――已跳过\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环：%s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
msgstr "正在写入‘%s’\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s：公钥“%s”已导入\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s：与我们的副本不吻合\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
- #: g10/import.c:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
- #: g10/import.c:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s：“%s”一个新的用户标识\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s：“%s”1 个新的签名\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s：“%s”%d 个新的签名\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s：“%s”1 个新的子钥\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s：“%s”%d 个新的子钥\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s：“%s”未改变\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s：私钥已导入\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "已跳过：私钥已存在\n"
- #: g10/import.c:1562
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
- #: g10/import.c:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s：“%s”吊销证书已被导入\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s：签名没有用户标识\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
- #: g10/import.c:1979
++#: g10/import.c:2021
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
- #: g10/import.c:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s：不支持的公钥算法\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s：没有可供绑定的子钥\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s：无效的子钥绑定\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s：已删除多重子钥绑定\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s：无效的子钥吊销\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s：已删除多重子钥吊销\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s：已跳过用户标识“%s”\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s：已跳过子钥\n"
@@@ -3533,52 -2859,42 +3640,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:2187
++#: g10/import.c:2229
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
- #: g10/import.c:2198
++#: g10/import.c:2240
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
- #: g10/import.c:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
- #: g10/import.c:2238
++#: g10/import.c:2280
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
- #: g10/import.c:2367
++#: g10/import.c:2409
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
- #: g10/import.c:2447
++#: g10/import.c:2489
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
- #: g10/import.c:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s：已新增吊销证书“%s”\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
@@@ -3605,62 -2917,53 +3712,67 @@@ msgstr "钥匙环‘%s’已建立\n
msgid "keyring '%s' created\n"
msgstr "钥匙环‘%s’已建立\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "密钥块资源‘%s’：%s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ msgid "error opening key DB: %s\n"
+ msgstr "‘%s’中出错：%s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立钥匙环缓存失败： %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[吊销]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[自身签名]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 个损坏的签名\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d 个损坏的签名\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "有 1 份签名因为遗失密钥而未被检查\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "有 %d 份签名因为遗失密钥而未被检查\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "有 1 份签名因为某个错误而未被检查\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "有 %d 份签名因为某些错误而未被检查\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "检测到 1 个没有有效自身签名的用户标识\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "检测到 %d 个没有有效自身签名的用户标识\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3671,17 -2974,14 +3783,17 @@@ msgstr "
"查\n"
"指纹等)？\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉强相信\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全相信\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3690,45 -2990,38 +3802,50 @@@ msgstr "
"请输入这份信任签名的深度。\n"
"深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "用户标识“%s”已被吊销。"
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "您仍然想要为它签名吗？(y/N)"
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " 无法添加签名。\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "用户标识“%s”已过期。"
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "警告：用户标识“%s”不含自身签名。"
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "可以为用户标识“%s”添加签名。"
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "为其添加签名吗？(y/N)"
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3737,65 -3030,52 +3854,65 @@@ msgstr "
"“%s”的自身签名是 PGP 2.x 样\n"
"式的签名。\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "您是否想要将它升级成 OpenPGP 的自身签名？(y/N)"
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr "您目前为“%s”的签名已经过期了。\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "您想要发布一份新的签名来取代已过期的那一个吗？(y/N)"
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr "您目前为“%s”的签名是一份本地签名。\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "您是否想要把它升级成可以完全导出的签名？(y/N)"
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "“%s”已由密钥 %s 在本地签名\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "“%s”已由密钥 %s 签名\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "您仍然想要为它再次签名吗？(y/N)"
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "没有东西可以让密钥 %s 签名\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "这把密钥已经过期！"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "这把密钥将在 %s 过期。\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "您想要让您的签名也同时过期吗？ (Y/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3804,33 -3084,27 +3921,33 @@@ msgstr "
"您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n"
"如果您不知道这个问题的答案，请输入“0”。\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答。 %s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本没有检查过。 %s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我随意检查过。 %s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地检查过。 %s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "您的选择？(输入‘?’以获得更多的信息)："
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3839,224 -3113,169 +3956,224 @@@ msgstr "
"您真的确定要签名这把密钥，使用您的密钥\n"
"“%s”(%s)\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "这将是一个自身签名。\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告：这份签名不会被标记为不可导出。\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告：这份签名不会被标记成不可吊销。\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "这份签名会被标记成不可导出。\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "这份签名会被标记成不可吊销。\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "我根本没有检查过这把密钥。\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "我随意检查过这把密钥。\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地检查过这把密钥。\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "真的要签名吗？(y/N)"
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败： %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "正在把密钥的签名移动到正确的位置去\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "保存并离开"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "显示密钥指纹"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
msgid "show the keygrip"
msgstr "输入注记："
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "列出密钥和用户标识"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "选择用户标识 N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "选择子钥 N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "检查签名"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "为所选用户标识添加本地签名"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "为所选用户标识添加信任签名"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "为所选用户标识添加不可吊销签名"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "增加一个用户标识"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "增加一个照片标识"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "删除选定的用户标识"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "添加一个子钥"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "在智能卡上添加一把密钥"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "将一把密钥移动到智能卡上"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "将备份密钥转移到卡上"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "删除选定的子钥"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "增加一把吊销密钥"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "删除所选用户标识上的签名"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "变更密钥或所选子钥的使用期限"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "将所选的用户标识设为首选用户标识"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "列出首选项(专家模式)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "列出首选项(详细模式)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "设定所选用户标识的首选项"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "设定所选用户标识的首选公钥服务器的 URL"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "为所选用户标识的设定注记"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "更改密码"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "更改信任度"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "吊销所选用户标识上的签名"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "吊销选定的用户标识"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "吊销密钥或选定的子钥"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "启用密钥"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "禁用密钥"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "显示选定的照片标识"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "压缩不可用的用户标识并删除不可用的签名"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "压缩不可用的用户标识并删除所有签名"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "私钥可用。\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "要有私钥才能这么做。\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4074,287 -3293,223 +4191,288 @@@ msgstr "
" 信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
" 合(ltsign、tnrsign 等)。\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "密钥已被吊销。"
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "真的为所有的用户标识签名吗？(y/N)"
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "真的为所有的用户标识签名吗？(y/N)"
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示：选择要添加签名的用户标识\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "未知的签名类型‘%s’\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "您至少得选择一个用户标识。\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "您不能删除最后一个用户标识！\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要删除所有选定的用户标识吗？(y/N)"
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "真的要删除这个用户标识吗？(y/N)"
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "真的要删除主钥吗？(y/N)"
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "您必须指定一把密钥。\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "命令需要一个文件名作为参数\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "无法打开‘%s’：%s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, fuzzy, c-format
#| msgid "Error reading backup key from `%s': %s\n"
msgid "Error reading backup key from '%s': %s\n"
msgstr "从‘%s’读取备份密钥时出错：%s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "您必须选择至少一把密钥。\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "您真的要删除这把密钥吗？(y/N)"
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要吊销这个用户标识吗？(y/N)"
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "您真的要吊销整把密钥吗？(y/N)"
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "您真的要吊销选定的子钥吗？(y/N)"
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "您真的要吊销这把子钥吗？(y/N)"
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "设为首选项列表为：\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗？(y/N)"
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "要保存变动吗？(y/N)"
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "要不保存而离开吗？(y/N)"
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "更新失败：%s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "密钥没有变动所以不需要更新。\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "找不到私钥“%s”：%s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "指纹无效"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "无法存储指纹：%s\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "没有这个用户标识。\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "没有东西可以让密钥 %s 签名\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "散列："
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "特点："
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "首选公钥服务器："
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "注记："
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "这把密钥可被 %s 密钥 %s 吊销"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr " (敏感的)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "创建于：%s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "已吊销：%s"
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "已过期：%s"
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "有效至：%s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "可用于：%s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "卡号："
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "信任度：%s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "有效性：%s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "已吊销"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "已过期"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
"警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
#, fuzzy
#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4363,78 -3518,61 +4481,78 @@@ msgstr "
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗？(y/N)"
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "删除这个完好的签名吗？(y/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "删除这个无效的签名吗？(y/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "删除这个未知的签名吗？(y/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要删除这个自身签名吗？(y/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "已经删除了 %d 个签名。\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "已经删除了 %d 个签名。\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "无效"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "用户标识“%s”：无用部分已清除\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "用户标识“%s”：无用部分已清除\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "用户标识“%s”：无用部分已清除\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4443,189 -3581,158 +4561,200 @@@ msgstr "
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识："
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "请至多选择一个子钥。\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "签名的子钥 %s 已经交叉验证\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签名\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL："
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗？(y/N)"
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗？(y/N)"
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "输入注记："
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "继续？(y/N)"
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "没有散列值为 %s 的用户标识\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "没有索引为 %d 的子钥\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识：“%s”\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (不可导出)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签名已在 %s 过期。\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗？(y/N)"
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (不可吊销)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签名：\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗？(y/N)"
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "没有私钥\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@@ -4666,14 -3765,10 +4795,14 @@@ msgstr "正在写入自身签名\n
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效：改用 %u 位\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
@@@ -4966,41 -4012,36 +5095,46 @@@ msgstr "
msgid "Real name: "
msgstr "真实姓名："
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "电子邮件地址："
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "注释："
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5011,7 -4052,6 +5145,7 @@@ msgstr "
" “%s”\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@@ -5026,35 -4066,28 +5160,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -5062,23 -4095,19 +5196,23 @@@ msgstr "
"您需要一个密码来保护您的私钥。\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符；请再试一次"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -5090,7 -4119,6 +5224,7 @@@ msgstr "
"再次执行这个程序，并且使用“--edit-key”选项即可。\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -5100,12 -4128,10 +5234,12 @@@ msgstr "
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败：%s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5113,59 -4139,48 +5247,59 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "密钥已存在\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "无论如何还是使用这把密钥吗？(y/N)"
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "生成新密钥\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "正在将公钥写至`%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环：%s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5173,258 -4188,204 +5307,258 @@@ msgstr "
"请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
#, fuzzy
#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "真的要建立吗？(y/N)"
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败：%s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "注意：卡密钥的备份已保存到‘%s’\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "永不过期"
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "关键签名策略："
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "签名策略："
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "关键首选公钥服务器："
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "关键签名注记："
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "签名注记："
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 个损坏的签名\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d 个损坏的签名\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr ""
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "钥匙环"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "“%s”已跳过：%s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr "主钥指纹："
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr "子钥指纹："
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " 主钥指纹："
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " 子钥指纹："
# use tty
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr "卡序列号 ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "缓存钥匙环‘%s’\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "缓存了 %lu 把密钥(%lu 份签名)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s：钥匙环已建立\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "在搜索结果中包含已吊销的密钥"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "按钥匙号搜索时包含子钥"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "验证签名时自动下载密钥"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "使用密钥中指定的首选公钥服务器 URL"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "获取密钥时使用密钥上的 PKA 记录"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "已禁用"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识：跳过\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s，从 %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "下载密钥 %s，从 %s\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告：无法获取 URI %s：%s\n"
@@@ -5458,7 -4413,6 +5592,7 @@@ msgstr "公钥加密过的数据：完�
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " “%s”\n"
@@@ -5504,258 -4449,207 +5638,259 @@@ msgstr "解密成功\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告：加密过的报文已经变造！\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr ""
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失败：%s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "注意：发件者要求您“只阅读不存盘”\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "未找到签名\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签名，来自于“%s”"
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签名，来自于“%s”"
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签名，来自于“%s”"
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "签名验证已被抑制\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些有歧义的签名\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "签名建立于 %s\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
- #: g10/mainproc.c:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "可用的密钥在："
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[不确定]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签名已于 %s 过期。\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签名在 %s 过期。\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, 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:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "二进制"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "文本模式"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "未知的公钥算法"
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签名：%s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "不是一份分离的签名\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告：检测到多重签名。只检查第一个签名。\n"
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签名\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签名\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, fuzzy, c-format
#| msgid "fstat of `%s' failed in %s: %s\n"
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) 在 %s 中出错：%s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "警告: 使用试验性质的公钥算法 %s\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "警告：不建议使用散列算法 %s\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "警告：使用试验性质的对称加密算法 %s\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "警告：使用试验性质的散列算法 %s\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "警告：不建议使用散列算法 %s\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s 签名，散列算法 %s\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d：不建议使用该选项“%s”\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "请以“%s%s”代替\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "不压缩"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "未压缩|无"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s 也许不能使用这个报文\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "有歧义的选项‘%s’\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA 需要散列值长度为 8 位的倍数\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type `%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "未知的签名类型‘%s’\n"
+
+#: g10/openfile.c:85
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
@@@ -5947,31 -4808,24 +6082,31 @@@ msgstr "这张照片正确吗？(y/N/q)
msgid "unable to display photo ID!\n"
msgstr "无法显示照片标识！\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "未指定原因"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "密钥被替换"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "密钥已泄漏"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "密钥不再使用"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "用户标识不再有效"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "吊销原因："
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "吊销注释："
@@@ -5986,52 -4840,41 +6121,52 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "下列项目没有指定信任度：\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " 亦即“%s”\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "您是否相信这把密钥属于它所声称的持有者？\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = 我不知道或我不作答\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = 我不相信\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = 我绝对相信\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = 回到主菜单\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = 跳过这把密钥\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " q = 退出\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6040,37 -4883,29 +6175,37 @@@ msgstr "
"这把密钥的最小信任等级为：%s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "您的决定是什么？"
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "您真的要把这把密钥设成绝对信任？(y/N)"
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "被绝对信任的密钥的证书：\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr "%s：没有证据表明这把密钥真的属于它所声称的持有者\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr "%s：只有有限的证据表明这把密钥属于它所声称的持有者\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "这把密钥有可能属于它所声称的持有者\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "这把密钥是属于我们的\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -6079,112 -4914,87 +6214,112 @@@ msgstr "
"这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
"己在做什么，您可以在下一个问题回答 yes。\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "无论如何还是使用这把密钥吗？(y/N)"
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "警告：正在使用不被信任的密钥！\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n"
- #: g10/pkclist.c:546
++#: g10/pkclist.c:547
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n"
- #: g10/pkclist.c:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " 这表明这个签名有可能是伪造的。\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "警告：这把子钥已经被它的持有者吊销了！\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "注意：这把密钥已经被禁用了。\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, 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:588
++#: g10/pkclist.c:589
#, 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:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "PKA 信息有效，信任级别调整到“完全”\n"
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "PKA 信息无效，信任级别调整到“从不”\n"
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "注意：这把密钥已经过期了！\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告：这把密钥未经受信任的签名认证！\n"
- #: g10/pkclist.c:632
++#: g10/pkclist.c:633
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 没有证据表明这个签名属于它所声称的持有者。\n"
- #: g10/pkclist.c:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告：我们不信任这把密钥！\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " 这个签名很有可能是伪造的。\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n"
- #: g10/pkclist.c:651
++#: g10/pkclist.c:652
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 这份签名并不一定属于它所声称的持有者\n"
- #: g10/pkclist.c:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s：已跳过：%s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s：已跳过：公钥已被禁用\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳过：公钥已存在\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
- #: g10/pkclist.c:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "当前收件人：\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6192,75 -5002,58 +6327,75 @@@ msgstr "
"\n"
"输入用户标识。以空白行结束："
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "没有这个用户标识。\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳过：公钥已被设为默认收件者\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "公钥被禁用。\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "已跳过：公钥已被设定\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的默认收件者“%s”\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "数据未被保存；请用“--output”选项来保存它们\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "建立‘%s’时发生错误：%s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "分离的签名。\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "请输入数据文件的名称： "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "正在从标准输入读取 ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "不含签名的数据\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, fuzzy, c-format
#| msgid "can't open signed data `%s'\n"
msgid "can't open signed data '%s'\n"
msgstr "无法打开有签名的数据‘%s’\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "无法打开有签名的数据‘%s’\n"
@@@ -6300,8 -5086,6 +6435,8 @@@ msgstr "注意：私钥 %s 已于 %s �
msgid "Note: key has been revoked"
msgstr "注意：密钥已被吊销"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet 失败：%s\n"
@@@ -6311,43 -5094,39 +6446,49 @@@
msgid "key %s has no user IDs\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "将被吊销，吊销者：\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(这是一把敏感的吊销密钥)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "私钥可用。\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "已强行使用 ASCII 封装过的输出。\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet 失败： %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "已建立吊销证书。\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "没有找到“%s”的吊销密钥\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6355,18 -5134,27 +6496,32 @@@
"a reason for the revocation."
msgstr ""
- #: g10/revoke.c:564
++#: g10/revoke.c:572
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "找不到私钥“%s”：%s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6384,33 -5172,26 +6539,33 @@@ msgstr "
"小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
"人也能够看得到的地方！\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "请选择吊销的原因：\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "取消"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(也许您会想要在这里选择 %d)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "请输入描述(可选)；以空白行结束：\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "吊销原因：%s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(不给定描述)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "这样可以吗？ (y/N)"
@@@ -6434,69 -5211,56 +6589,69 @@@ msgstr "DSA 密钥 %s 使用不安全�
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "DSA 密钥 %s 需要 %u 位或更长的散列\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "警告：签名散列值与报文不一致\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "警告：签名的子钥 %s 未经交叉验证\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "请参见 %s 以得到更多信息。\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "警告：签名的子钥 %s 交叉验证无效\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, fuzzy, c-format
#| msgid "NOTE: signature key %s expired %s\n"
msgid "Note: signature key %s expired %s\n"
msgstr "注意：签名密钥 %s 已于 %s 过期\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "注意：密钥已被吊销"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
@@@ -6534,29 -5292,23 +6689,29 @@@ msgstr "警告：强行使用的 %s (%d
msgid "signing:"
msgstr "正在签名："
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "“%s”已跳过：重复\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "已跳过：私钥已存在\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
@@@ -6604,7 -5348,6 +6759,7 @@@ msgstr "在‘%s’中寻找信任度�
msgid "read error in '%s': %s\n"
msgstr "读取‘%s’错误：%s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "信任度数据库：同步失败：%s\n"
@@@ -6635,7 -5373,6 +6790,7 @@@ msgstr "信任度数据库记录 %lu：
msgid "trustdb transaction too large\n"
msgstr "信任度数据库处理量过大\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -6753,121 -5467,97 +6908,121 @@@ msgstr "无法处理长于 %d 字符的
msgid "input line longer than %d characters\n"
msgstr "输入行长度超过 %d 字符\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, fuzzy, c-format
#| msgid "`%s' is not a valid long keyID\n"
msgid "'%s' is not a valid long keyID\n"
msgstr "‘%s’不是一个有效的长式钥匙号\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "密钥 %s：受信任，已接受\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "密钥 %s 在信任度数据库中重复出现\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "密钥 %s：受信任的密钥没有公钥――已跳过\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "密钥 %s 被标记为绝对信任\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "使用 %s 信任模型\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "不需要检查信任度数据库\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任度数据库检查将于 %s 进行\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, fuzzy, c-format
#| msgid "no need for a trustdb check with `%s' trust model\n"
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, fuzzy, c-format
#| msgid "no need for a trustdb update with `%s' trust model\n"
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "找不到公钥 %s：%s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "请执行一次 --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "正在检查信任度数据库\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "没有找到任何绝对信任的密钥\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
"深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@@ -7104,11 -5745,9 +7259,11 @@@ msgstr "CHV%d 的 PIN 太短；最小�
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败：%s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定！\n"
@@@ -7244,12 -5855,10 +7399,12 @@@ msgstr "卡不支持散列算法 %s\n
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名：%lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@@ -7271,7 -5877,6 +7426,7 @@@ msgstr "新的 PIN
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7328,12 -5921,10 +7483,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7766,7 -6265,6 +7921,7 @@@ msgstr "建立钥匙环‘%s’时发�
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "生成密钥失败：%s\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8365,7 -6743,6 +8520,7 @@@ msgstr "证书已损坏
msgid " runtime cached certificates: %u\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
#, fuzzy
msgid "certificate already cached\n"
msgstr "已建立吊销证书。\n"
@@@ -8375,8 -6751,6 +8530,8 @@@
msgid "certificate cached\n"
msgstr "首选项‘%s’重复\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
@@@ -8439,7 -6802,6 +8594,7 @@@ msgstr "无法读出公钥：%s\n
msgid "not removing file '%s'\n"
msgstr "进行 ASCII 封装失败：%s\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, fuzzy, c-format
msgid "error closing cache file: %s\n"
msgstr "‘%s’中出错：%s\n"
@@@ -8666,221 -6984,178 +8821,221 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr ""
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr ""
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, fuzzy, c-format
msgid "converting S-expression failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "无法读出公钥：%s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, fuzzy, c-format
#| msgid "build_packet failed: %s\n"
msgid "ksba_crl_parse failed: %s\n"
msgstr "build_packet 失败：%s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, fuzzy, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr ""
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr ""
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting CRL item: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, fuzzy, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "%s：写入目录记录时出错：%s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, fuzzy, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "生成一份吊销证书"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr ""
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, fuzzy, c-format
#| msgid "signature verification suppressed\n"
msgid "CRL signature verification failed: %s\n"
msgstr "签名验证已被抑制\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, fuzzy, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, fuzzy, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, fuzzy, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "更新失败：%s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, fuzzy, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "无法建立目录‘%s’：%s\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, fuzzy, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "无法建立目录‘%s’：%s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, fuzzy, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, fuzzy, c-format
#| msgid "update secret failed: %s\n"
msgid "crl_parse_insert failed: %s\n"
msgstr "更新私钥失败：%s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, fuzzy, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "%s：写入目录记录时出错：%s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, fuzzy, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr ""
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, fuzzy, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, fuzzy, c-format
msgid "creating cache file '%s'\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr ""
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr ""
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr ""
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr ""
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
#, fuzzy
#| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
msgstr "警告：随机数种子文件大小无效――未使用\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, fuzzy, c-format
msgid "problem reading cache record: %s\n"
msgstr "%s：读取自由记录时出错：%s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, fuzzy, c-format
#| msgid "error reading keyblock: %s\n"
msgid "problem reading cache key: %s\n"
msgstr "读取密钥区块时发生错误：%s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, fuzzy, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr ""
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, fuzzy, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "更新失败：%s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, fuzzy, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, fuzzy, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "无法读出公钥：%s\n"
@@@ -8927,75 -7192,59 +9082,75 @@@ msgstr "建立‘%s’时发生错误�
msgid "error retrieving '%s': http status %u\n"
msgstr "读取‘%s’时出错：%s\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "找不到私钥“%s”：%s\n"
+#: dirmngr/crlfetch.c:386
#, fuzzy, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr ""
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr ""
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
#, fuzzy
msgid "add a certificate to the cache"
msgstr "已建立吊销证书。\n"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
#, fuzzy
msgid "validate a certificate"
msgstr "证书已损坏"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
#, fuzzy
msgid "lookup a certificate"
msgstr "证书已损坏"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
#, fuzzy
msgid "lookup only locally stored certificates"
msgstr "证书已损坏"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr ""
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr ""
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr ""
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
#, fuzzy
msgid "expect certificates in PEM format"
msgstr "证书已损坏"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
#, fuzzy
#| msgid "Enter the user ID of the designated revoker: "
msgid "force the use of the default OCSP responder"
msgstr "输入指定吊销者的用户标识："
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9003,228 -7252,157 +9158,201 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, fuzzy, c-format
+ #| msgid "can't connect to `%s': %s\n"
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "无法连接至‘%s’：%s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "更新失败：%s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "loading CRL '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
#, fuzzy
msgid "certificate is valid\n"
msgstr "首选项‘%s’重复\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "注意：密钥已被吊销"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "无法获得文件‘%s’的信息： %s\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, fuzzy, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "%s：建立散列表失败：%s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:509
- #, fuzzy, c-format
- msgid "malformed %s environment variable\n"
- msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, fuzzy, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "不支持 gpg-agent 协议版本 %d\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr ""
-
- #: dirmngr/dirmngr-client.c:550
- #, fuzzy, c-format
- #| msgid "can't connect to `%s': %s\n"
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "无法连接至‘%s’：%s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"支持的算法：\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr ""
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "从‘%s’读取选项\n"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "要不保存而离开吗？(y/N)"
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "从‘%s’读取选项\n"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "无法解析公钥服务器 URL\n"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9237,95 -7415,76 +9365,95 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "用法：gpg [选项] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
#, 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:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, 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:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "列太长"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "指纹无效"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "读取‘%s’错误：%s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "可选"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -9582,12 -7690,10 +9710,12 @@@ msgstr "将密钥‘%s’上传到 %s �
msgid "malloc failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr ""
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@@ -9623,11 -7723,10 +9751,12 @@@ msgstr "读取‘%s’时出错：%s\n
msgid "response from server too large; limit is %d bytes\n"
msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
+#: dirmngr/ocsp.c:139
- msgid "OCSP request not possible due to TOR mode\n"
- msgstr ""
+ #, fuzzy
+ msgid "OCSP request not possible due to Tor mode\n"
+ msgstr "找不到私钥“%s”：%s\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr ""
@@@ -9776,73 -7845,62 +9905,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, fuzzy, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "%s：建立散列表失败：%s\n"
+
++#: dirmngr/server.c:2430
#, 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:2312
++#: dirmngr/server.c:2438
#, 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:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10098,11 -8096,9 +10232,11 @@@ msgstr "
msgid "Options controlling the interactivity and enforcement"
msgstr ""
+#: tools/gpgconf-comp.c:911
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr ""
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr ""
diff --cc po/zh_TW.gmo
index d04e238,0000000..9cf2275
mode 100644,000000..100644
Binary files differ
diff --cc po/zh_TW.po
index 2f04092,2170e0b..b865bb8
--- 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: 2015-10-09 17:17+0200\n"
++"POT-Creation-Date: 2015-12-04 10:57+0100\n"
"PO-Revision-Date: 2014-11-22 20:56+0800\n"
"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@@ -80,7 -69,6 +80,7 @@@ msgstr "請輸入新密語
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
- #: agent/call-pinentry.c:722
++#: agent/call-pinentry.c:724
msgid "Quality:"
msgstr "優劣程度: %s"
@@@ -90,71 -78,55 +90,71 @@@
#. tooltip is limited to about 900 characters. If you do not
#. translate this entry, a default english text (see source)
#. will be used.
- #: agent/call-pinentry.c:744
++#: agent/call-pinentry.c:746
msgid "pinentry.qualitybar.tooltip"
msgstr ""
"上列輸入文字的優劣程度.\n"
"關於此規範的細節, 請洽你的系統管理者."
- #: agent/call-pinentry.c:854
++#: agent/call-pinentry.c:856
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開私鑰"
- #: agent/call-pinentry.c:857
++#: agent/call-pinentry.c:859
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
msgid "PIN:"
msgstr ""
- #: agent/call-pinentry.c:895 agent/call-pinentry.c:1079
++#: agent/call-pinentry.c:897 agent/call-pinentry.c:1081
+#: agent/protect-tool.c:704 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "密語:"
- #: agent/call-pinentry.c:924 agent/command-ssh.c:3139 agent/genkey.c:416
++#: agent/call-pinentry.c:926 agent/command-ssh.c:3139 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr "前後不一致 - 請再試一次"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:945
++#: agent/call-pinentry.c:947
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
- #: agent/call-pinentry.c:957
++#: agent/call-pinentry.c:959
msgid "Repeat:"
msgstr "重複:"
- #: agent/call-pinentry.c:987 agent/call-pinentry.c:999
++#: agent/call-pinentry.c:989 agent/call-pinentry.c:1001
msgid "PIN too long"
msgstr "個人識別碼 (PIN) 太長"
- #: agent/call-pinentry.c:988
++#: agent/call-pinentry.c:990
msgid "Passphrase too long"
msgstr "密語太長"
- #: agent/call-pinentry.c:996
++#: agent/call-pinentry.c:998
msgid "Invalid characters in PIN"
msgstr "個人識別碼 (PIN) 含有無效的字符"
- #: agent/call-pinentry.c:1001
++#: agent/call-pinentry.c:1003
msgid "PIN too short"
msgstr "個人識別碼 (PIN) 太短"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad PIN"
msgstr "不良的個人識別碼 (PIN)"
- #: agent/call-pinentry.c:1014
++#: agent/call-pinentry.c:1016
msgid "Bad Passphrase"
msgstr "不良的密語"
@@@ -163,24 -134,10 +163,24 @@@
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
- #: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:833
- #: g10/exec.c:484 g10/gpg.c:1238 g10/keygen.c:4002 g10/keyring.c:1262
- #: g10/keyring.c:1592 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
- #: g10/sign.c:1112 g10/tdbio.c:702
++#: agent/command-ssh.c:868 common/dotlock.c:789 g10/card-util.c:839
++#: g10/exec.c:484 g10/gpg.c:1254 g10/keygen.c:4009 g10/keyring.c:1357
++#: g10/keyring.c:1689 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:702
#, c-format
msgid "can't create '%s': %s\n"
msgstr "無法建立 '%s': %s\n"
- #: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:787
++#: agent/command-ssh.c:880 common/helpfile.c:57 g10/card-util.c:793
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:67 g10/decrypt.c:136
- #: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1239
- #: g10/import.c:221 g10/import.c:394 g10/keygen.c:3285 g10/keyring.c:1618
++#: g10/decrypt.c:153 g10/encrypt.c:198 g10/encrypt.c:544 g10/gpg.c:1255
++#: g10/import.c:221 g10/import.c:394 g10/keygen.c:3289 g10/keyring.c:1715
+#: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:584 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1096
- #: g10/sign.c:1241 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
++#: g10/plaintext.c:626 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:144 g10/tdbdump.c:152 g10/tdbio.c:707
+#: g10/tdbio.c:779 g10/verify.c:98 g10/verify.c:162 sm/gpgsm.c:2127
+#: sm/gpgsm.c:2157 sm/gpgsm.c:2195 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2412 dirmngr/dirmngr.c:1659
++#: dirmngr/crlcache.c:2414 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
@@@ -253,11 -197,9 +253,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "從 socket 建立串流失敗: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1242
++#: agent/divert-scd.c:92 g10/call-agent.c:1248
msgid "Please insert the card with serial number"
msgstr "請插入下列序號的卡片:"
- #: agent/divert-scd.c:93 g10/call-agent.c:1243
++#: agent/divert-scd.c:93 g10/call-agent.c:1249
msgid "Please remove the current card and insert the one with serial number"
msgstr "請移除現用中的卡片並插入下列序號的卡片:"
@@@ -387,41 -303,27 +387,41 @@@ msgstr "
"@選項:\n"
" "
- #: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:149 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "以服務模式執行 (背景)"
- #: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:154
++#: agent/gpg-agent.c:150 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "以伺服器模式執行 (前景)"
- #: agent/gpg-agent.c:151 g10/gpg.c:528 g10/gpgv.c:71 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:68
- #: dirmngr/dirmngr.c:169 dirmngr/dirmngr_ldap.c:135
++#: agent/gpg-agent.c:151 g10/gpg.c:539 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "囉唆模式"
- #: agent/gpg-agent.c:152 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:69 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:152 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:294 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "盡量安靜些"
- #: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:153 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sh 樣式的指令輸出"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:154 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "csh 樣式的指令輸出"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:120 sm/gpgsm.c:324
- #: dirmngr/dirmngr.c:173 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|檔案|從指定檔案中讀取選項"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:176
++#: agent/gpg-agent.c:164 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "不要從 console 分離"
@@@ -500,11 -385,6 +500,11 @@@ msgstr "啟用 putty 支援
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:440 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:945 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:273
- #: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:147 dirmngr/dirmngr.c:347
++#: g10/gpg.c:961 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:146 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:107 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
@@@ -520,138 -398,100 +520,137 @@@ msgstr "
"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:497 g10/gpg.c:1136 scd/scdaemon.c:346 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:431
++#: agent/gpg-agent.c:497 g10/gpg.c:1152 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "給定的除錯等級 '%s' 無效\n"
- #: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:157
++#: agent/gpg-agent.c:744 agent/protect-tool.c:562 g10/gpgv.c:159
+#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:937 sm/gpgsm.c:940
- #: dirmngr/dirmngr.c:740 dirmngr/dirmngr.c:743 dirmngr/dirmngr.c:752
++#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1005 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:861 g10/gpg.c:2275 scd/scdaemon.c:519 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:875
++#: agent/gpg-agent.c:861 g10/gpg.c:2602 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:895
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "請注意: 沒有預設選項檔 '%s'\n"
- #: agent/gpg-agent.c:872 agent/gpg-agent.c:1542 g10/gpg.c:2279
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:880
- #: dirmngr/dirmngr.c:1765 tools/symcryptrun.c:938
++#: agent/gpg-agent.c:872 agent/gpg-agent.c:1543 g10/gpg.c:2606
++#: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: dirmngr/dirmngr.c:1774 tools/symcryptrun.c:938
#, c-format
msgid "option file '%s': %s\n"
msgstr "選項檔 '%s': %s\n"
- #: agent/gpg-agent.c:880 g10/gpg.c:2286 scd/scdaemon.c:532 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:888
++#: agent/gpg-agent.c:880 g10/gpg.c:2613 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "從 '%s' 讀取選項中\n"
- #: agent/gpg-agent.c:1004 g10/gpg.c:3302 scd/scdaemon.c:652 sm/gpgsm.c:1517
- #: dirmngr/dirmngr.c:1000 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
++#: agent/gpg-agent.c:1004 g10/gpg.c:3670 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: dirmngr/dirmngr.c:1019 tools/gpg-connect-agent.c:1238 tools/gpgconf.c:209
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "請注意: '%s' 並不當成選項\n"
- #: agent/gpg-agent.c:1679 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1111
++#: agent/gpg-agent.c:1680 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "無法建立 socket: %s\n"
- #: agent/gpg-agent.c:1701 agent/gpg-agent.c:1720 scd/scdaemon.c:1092
- #: scd/scdaemon.c:1110 dirmngr/dirmngr.c:1125 dirmngr/dirmngr.c:1145
++#: agent/gpg-agent.c:1697 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "socket 名稱 '%s' 太長\n"
- #: agent/gpg-agent.c:1750
++#: agent/gpg-agent.c:1735
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
- #: agent/gpg-agent.c:1760 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1167
++#: agent/gpg-agent.c:1745 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "為 socket 取得 nonce 時出錯\n"
- #: agent/gpg-agent.c:1765 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1170
++#: agent/gpg-agent.c:1750 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
- #: agent/gpg-agent.c:1776 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1180
++#: agent/gpg-agent.c:1761 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() 失敗: %s\n"
- #: agent/gpg-agent.c:1783 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1186
++#: agent/gpg-agent.c:1768 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "正在候聽 socket '%s'\n"
- #: agent/gpg-agent.c:1802 agent/gpg-agent.c:1841 g10/exec.c:199
++#: agent/gpg-agent.c:1787 agent/gpg-agent.c:1826 g10/exec.c:199
+#: g10/openfile.c:489 g10/openfile.c:518 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "無法建立目錄 '%s': %s\n"
- #: agent/gpg-agent.c:1805 agent/gpg-agent.c:1846 g10/openfile.c:492
++#: agent/gpg-agent.c:1790 agent/gpg-agent.c:1831 g10/openfile.c:492
+#: g10/openfile.c:521 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "目錄 '%s' 已建立\n"
- #: agent/gpg-agent.c:1852
++#: agent/gpg-agent.c:1837
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s' 的 stat() 失敗: %s\n"
- #: agent/gpg-agent.c:1856
++#: agent/gpg-agent.c:1841
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "無法使用 '%s' 做為家目錄\n"
- #: agent/gpg-agent.c:1999 scd/scdaemon.c:1161 dirmngr/dirmngr.c:1956
++#: agent/gpg-agent.c:1984 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
- #: agent/gpg-agent.c:2205
++#: agent/gpg-agent.c:2190
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
- #: agent/gpg-agent.c:2210
++#: agent/gpg-agent.c:2195
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2283
++#: agent/gpg-agent.c:2268
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
- #: agent/gpg-agent.c:2288
++#: agent/gpg-agent.c:2273
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2456 scd/scdaemon.c:1284 dirmngr/dirmngr.c:2087
++#: agent/gpg-agent.c:2441 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
- #: agent/gpg-agent.c:2519 scd/scdaemon.c:1334
++#: agent/gpg-agent.c:2504 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 已停止\n"
- #: agent/gpg-agent.c:2657 common/simple-pwquery.c:330 g10/call-agent.c:298
++#: agent/gpg-agent.c:2642 common/simple-pwquery.c:330 g10/call-agent.c:298
+#: sm/call-agent.c:108 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "在此階段中沒有執行中的 gpg-agent\n"
@@@ -667,8 -505,6 +666,8 @@@ msgstr "
"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
"密碼快取維護\n"
- #: agent/protect-tool.c:105 g10/gpg.c:395 kbx/kbxutil.c:71 sm/gpgsm.c:193
- #: dirmngr/dirmngr.c:152 tools/gpgconf.c:63
++#: agent/protect-tool.c:105 g10/gpg.c:403 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -676,9 -512,6 +675,9 @@@ msgstr "
"@指令:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:479 g10/gpgv.c:69 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:167 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:114 g10/gpg.c:489 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -731,7 -556,6 +730,7 @@@ msgstr "已取消\n
msgid "error while asking for the passphrase: %s\n"
msgstr "詢問密語時出錯: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1567
++#: agent/trustlist.c:154 agent/trustlist.c:355 dirmngr/dirmngr.c:1576
#, c-format
msgid "error opening '%s': %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
@@@ -911,8 -701,6 +910,8 @@@ msgstr "建立管道時出錯: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "建立管道串流時出錯: %s\n"
+#: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1204
++#: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "衍生執行程序時出錯: %s\n"
@@@ -1060,7 -816,6 +1059,7 @@@ msgstr "沒有執行中的 gpg-agent -
msgid "waiting for the agent to come up ... (%ds)\n"
msgstr "正在等候代理程式出現 ... (%d 秒)\n"
- #: common/asshelp.c:478 common/asshelp.c:501
++#: common/asshelp.c:478
msgid "connection to agent established\n"
msgstr "至代理程式的連線已建立\n"
@@@ -1080,7 -832,6 +1079,7 @@@ msgstr "沒有執行中的 Dirmngr - �
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "正在等候 dirmngr 出現 ... (%d 秒)\n"
- #: common/asshelp.c:666 common/asshelp.c:697
++#: common/asshelp.c:666
msgid "connection to the dirmngr established\n"
msgstr "連線至 dirmngr 已建立\n"
@@@ -1338,7 -1029,6 +1337,7 @@@ msgstr "\"%.50s\" 選項不明確\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" 指令不明確\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1222
++#: common/argparse.c:401 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "超出核心\n"
@@@ -1513,19 -1165,14 +1512,19 @@@ msgstr "以 %s 代理伺服器查詢用
msgid "Enter passphrase: "
msgstr "請輸入密語: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1693
- #: g10/keygen.c:4534
++#: g10/card-util.c:87 g10/card-util.c:384 g10/card-util.c:1699
++#: g10/keygen.c:4547
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "沒有可用的 OpenPGP 卡片: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1699
++#: g10/card-util.c:92 g10/card-util.c:1705
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "偵測到 OpenPGP 卡片編號 %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1896 g10/delkey.c:127
- #: g10/keyedit.c:1518 g10/keygen.c:3610 g10/revoke.c:216 g10/revoke.c:603
++#: g10/card-util.c:100 g10/card-util.c:1902 g10/delkey.c:129
++#: g10/keyedit.c:1529 g10/keygen.c:3617 g10/revoke.c:216 g10/revoke.c:611
msgid "can't do this in batch mode\n"
msgstr "無法在批次模式中這樣做\n"
@@@ -1537,153 -1182,114 +1536,153 @@@ msgstr "祇有第二版卡片纔能用�
msgid "Reset Code not or not anymore available\n"
msgstr "(再也) 沒有重設碼\n"
- #: g10/card-util.c:143 g10/card-util.c:1462 g10/card-util.c:1575
- #: g10/keyedit.c:462 g10/keyedit.c:482 g10/keyedit.c:496 g10/keygen.c:1712
++#: g10/card-util.c:143 g10/card-util.c:1468 g10/card-util.c:1581
++#: g10/keyedit.c:464 g10/keyedit.c:484 g10/keyedit.c:498 g10/keygen.c:1712
+#: g10/keygen.c:1886 g10/keygen.c:2210 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "你要選哪一個? "
- #: g10/card-util.c:279 g10/card-util.c:330
++#: g10/card-util.c:280 g10/card-util.c:331
msgid "[not set]"
msgstr "[未設定]"
- #: g10/card-util.c:528
++#: g10/card-util.c:534
msgid "male"
msgstr "男性"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "female"
msgstr "女性"
- #: g10/card-util.c:529
++#: g10/card-util.c:535
msgid "unspecified"
msgstr "未特定"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "not forced"
msgstr "不強迫使用"
- #: g10/card-util.c:556
++#: g10/card-util.c:562
msgid "forced"
msgstr "強迫使用"
- #: g10/card-util.c:631
++#: g10/card-util.c:637
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
- #: g10/card-util.c:633
++#: g10/card-util.c:639
msgid "Error: The \"<\" character may not be used.\n"
msgstr "錯誤: 不能使用 \"<\" 字符.\n"
- #: g10/card-util.c:635
++#: g10/card-util.c:641
msgid "Error: Double spaces are not allowed.\n"
msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
- #: g10/card-util.c:652
++#: g10/card-util.c:658
msgid "Cardholder's surname: "
msgstr "卡片持有者的姓氏: "
- #: g10/card-util.c:654
++#: g10/card-util.c:660
msgid "Cardholder's given name: "
msgstr "卡片持有者的名字: "
- #: g10/card-util.c:672
++#: g10/card-util.c:678
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
- #: g10/card-util.c:693
++#: g10/card-util.c:699
msgid "URL to retrieve public key: "
msgstr "取回公鑰的 URL: "
- #: g10/card-util.c:701
++#: g10/card-util.c:707
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
- #: g10/card-util.c:794 tools/no-libgcrypt.c:30
++#: g10/card-util.c:800 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "配置足夠的記憶體時出錯: %s\n"
- #: g10/card-util.c:806 g10/import.c:365 g10/import.c:413
- #: dirmngr/crlcache.c:656 dirmngr/crlcache.c:661 dirmngr/crlcache.c:915
- #: dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1605
++#: g10/card-util.c:812 g10/decrypt-data.c:242 g10/import.c:365
++#: g10/import.c:413 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: dirmngr/crlcache.c:915 dirmngr/crlcache.c:921 dirmngr/dirmngr.c:1614
#, c-format
msgid "error reading '%s': %s\n"
msgstr "讀取 '%s' 時出錯: %s\n"
- #: g10/card-util.c:839 dirmngr/crlcache.c:926
++#: g10/card-util.c:845 g10/decrypt-data.c:245 dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "寫入 '%s' 時出錯: %s\n"
- #: g10/card-util.c:866
++#: g10/card-util.c:872
msgid "Login data (account name): "
msgstr "登入資料 (帳號名稱): "
- #: g10/card-util.c:876
++#: g10/card-util.c:882
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
- #: g10/card-util.c:912
++#: g10/card-util.c:918
msgid "Private DO data: "
msgstr "私人的 DO 資料: "
- #: g10/card-util.c:922
++#: g10/card-util.c:928
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
- #: g10/card-util.c:1005
++#: g10/card-util.c:1011
msgid "Language preferences: "
msgstr "介面語言偏好設定: "
- #: g10/card-util.c:1013
++#: g10/card-util.c:1019
msgid "Error: invalid length of preference string.\n"
msgstr "錯誤: 無效的偏好設定字串長度\n"
- #: g10/card-util.c:1022
++#: g10/card-util.c:1028
msgid "Error: invalid characters in preference string.\n"
msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
- #: g10/card-util.c:1044
++#: g10/card-util.c:1050
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性別 ((M)男性, (F)女性或留空): "
- #: g10/card-util.c:1058
++#: g10/card-util.c:1064
msgid "Error: invalid response.\n"
msgstr "錯誤: 無效的回應.\n"
- #: g10/card-util.c:1080
++#: g10/card-util.c:1086
msgid "CA fingerprint: "
msgstr "憑證中心 (CA) 指紋: "
- #: g10/card-util.c:1103
++#: g10/card-util.c:1109
msgid "Error: invalid formatted fingerprint.\n"
msgstr "錯誤: 無效的格式化指紋.\n"
- #: g10/card-util.c:1153
++#: g10/card-util.c:1159
#, c-format
msgid "key operation not possible: %s\n"
msgstr "不可能進行金鑰操作: %s\n"
- #: g10/card-util.c:1154
++#: g10/card-util.c:1160
msgid "not an OpenPGP card"
msgstr "這不是 OpenPGP 卡片"
- #: g10/card-util.c:1167
++#: g10/card-util.c:1173
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得現用金鑰資訊時出錯: %s\n"
- #: g10/card-util.c:1254
++#: g10/card-util.c:1260
msgid "Replace existing key? (y/N) "
msgstr "是否要取代既有的金鑰? (y/N) "
- #: g10/card-util.c:1271
++#: g10/card-util.c:1277
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1693,55 -1299,43 +1692,55 @@@ msgstr "
" 如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
" 看看這張卡片支援哪些尺寸.\n"
- #: g10/card-util.c:1296
++#: g10/card-util.c:1302
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "你的簽署金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1298
++#: g10/card-util.c:1304
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1299
++#: g10/card-util.c:1305
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1310 g10/keygen.c:2092 g10/keygen.c:2124
++#: g10/card-util.c:1316 g10/keygen.c:2092 g10/keygen.c:2124
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "加大到 %u 位元\n"
- #: g10/card-util.c:1318 g10/keygen.c:2079 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2079 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
- #: g10/card-util.c:1323
++#: g10/card-util.c:1329
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
- #: g10/card-util.c:1343
++#: g10/card-util.c:1349
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "將金鑰 %d 尺寸變更至 %u 位元時出錯: %s\n"
- #: g10/card-util.c:1367
++#: g10/card-util.c:1373
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
- #: g10/card-util.c:1381
++#: g10/card-util.c:1387
msgid "Note: keys are already stored on the card!\n"
msgstr "請注意: 金鑰已經存放在卡片上了!\n"
- #: g10/card-util.c:1384
++#: g10/card-util.c:1390
msgid "Replace existing keys? (y/N) "
msgstr "是否要取代既有的金鑰? (y/N) "
- #: g10/card-util.c:1396
++#: g10/card-util.c:1402
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1752,144 -1346,109 +1751,144 @@@ msgstr "
" PIN = '%s' 管理者 PIN = '%s'\n"
"你應該用 --change-pin 指令來加以變更\n"
- #: g10/card-util.c:1453
++#: g10/card-util.c:1459
msgid "Please select the type of key to generate:\n"
msgstr "請選擇你要產生的金鑰種類:\n"
- #: g10/card-util.c:1455 g10/card-util.c:1566
++#: g10/card-util.c:1461 g10/card-util.c:1572
msgid " (1) Signature key\n"
msgstr " (1) 簽署用金鑰\n"
- #: g10/card-util.c:1456 g10/card-util.c:1568
++#: g10/card-util.c:1462 g10/card-util.c:1574
msgid " (2) Encryption key\n"
msgstr " (2) 加密用金鑰\n"
- #: g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/card-util.c:1463 g10/card-util.c:1576
msgid " (3) Authentication key\n"
msgstr " (3) 憑證用金鑰\n"
- #: g10/card-util.c:1474 g10/card-util.c:1595 g10/keyedit.c:949
++#: g10/card-util.c:1480 g10/card-util.c:1601 g10/keyedit.c:960
+#: g10/keygen.c:1738 g10/keygen.c:1766 g10/keygen.c:1995 g10/keygen.c:2233
- #: g10/revoke.c:753
++#: g10/revoke.c:813
msgid "Invalid selection.\n"
msgstr "無效的選擇.\n"
- #: g10/card-util.c:1563
++#: g10/card-util.c:1569
msgid "Please select where to store the key:\n"
msgstr "請選擇要把金鑰存放在哪裡:\n"
- #: g10/card-util.c:1609
++#: g10/card-util.c:1615
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "KEYTOCARD 失敗: %s\n"
- #: g10/card-util.c:1705
++#: g10/card-util.c:1711
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "在 %s 模式中不允許使用這個指令.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1716
#, fuzzy
#| msgid "Note: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "請注意: 金鑰已經存放在卡片上了!\n"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1719
#, fuzzy
#| msgid "Continue? (Y/n) "
msgid "Continue? (y/N) "
msgstr "是否繼續? (Y/n) "
- #: g10/card-util.c:1718
++#: g10/card-util.c:1724
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1804 g10/keyedit.c:1356
++#: g10/card-util.c:1810 g10/keyedit.c:1367
msgid "quit this menu"
msgstr "離開這個選單"
- #: g10/card-util.c:1806
++#: g10/card-util.c:1812
msgid "show admin commands"
msgstr "顯示管理者指令"
- #: g10/card-util.c:1807 g10/keyedit.c:1359
++#: g10/card-util.c:1813 g10/keyedit.c:1370
msgid "show this help"
msgstr "顯示這份線上說明"
- #: g10/card-util.c:1809
++#: g10/card-util.c:1815
msgid "list all available data"
msgstr "列出所有可用的資料"
- #: g10/card-util.c:1812
++#: g10/card-util.c:1818
msgid "change card holder's name"
msgstr "變更卡片持有人的名字"
- #: g10/card-util.c:1813
++#: g10/card-util.c:1819
msgid "change URL to retrieve key"
msgstr "變更取回金鑰的 URL"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1820
msgid "fetch the key specified in the card URL"
msgstr "從卡片 URL 取回指定的金鑰"
- #: g10/card-util.c:1815
++#: g10/card-util.c:1821
msgid "change the login name"
msgstr "變更登入名稱"
- #: g10/card-util.c:1816
++#: g10/card-util.c:1822
msgid "change the language preferences"
msgstr "變更介面語言偏好設定"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1823
msgid "change card holder's sex"
msgstr "變更卡片持有者的性別"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1824
msgid "change a CA fingerprint"
msgstr "變更某個憑證中心 (CA) 的指紋"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1825
msgid "toggle the signature force PIN flag"
msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1826
msgid "generate new keys"
msgstr "產生新的金鑰"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1827
msgid "menu to change or unblock the PIN"
msgstr "變更或重設個人識別碼 (PIN) 的選單"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1828
msgid "verify the PIN and list all data"
msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1829
msgid "unblock the PIN using a Reset Code"
msgstr "用重設碼來解凍個人識別碼 (PIN)"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1830
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1946
++#: g10/card-util.c:1952
msgid "gpg/card> "
msgstr "gpg/卡片> "
- #: g10/card-util.c:1987
++#: g10/card-util.c:1993
msgid "Admin-only command\n"
msgstr "限管理者使用的指令\n"
- #: g10/card-util.c:2018
++#: g10/card-util.c:2024
msgid "Admin commands are allowed\n"
msgstr "允許使用管理者指令\n"
- #: g10/card-util.c:2020
++#: g10/card-util.c:2026
msgid "Admin commands are not allowed\n"
msgstr "未允許使用管理者指令\n"
- #: g10/card-util.c:2115 g10/keyedit.c:2295
++#: g10/card-util.c:2121 g10/keyedit.c:2316
msgid "Invalid command (try \"help\")\n"
msgstr "無效的指令 (試試看 \"help\")\n"
@@@ -1897,72 -1455,59 +1896,79 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output 在這個指令中沒有作用\n"
- #: g10/decrypt.c:248 g10/gpg.c:4374 g10/keyring.c:399 g10/keyring.c:737
++#: g10/decrypt.c:248 g10/gpg.c:4870 g10/keyring.c:401 g10/keyring.c:774
#, c-format
msgid "can't open '%s'\n"
msgstr "無法開啟 '%s'\n"
- #: g10/delkey.c:78 g10/delkey.c:117 g10/export.c:797 g10/keyedit.c:1539
- #: g10/keyedit.c:2468 g10/keyedit.c:3852 g10/keylist.c:633
- #: g10/keyserver.c:1227 g10/revoke.c:227
++#: g10/delkey.c:80 g10/export.c:885 g10/getkey.c:1198 g10/gpg.c:2176
++#: g10/gpg.c:2226 g10/gpg.c:4826 g10/keyedit.c:1550 g10/keyedit.c:2495
++#: g10/keyedit.c:3890 g10/keylist.c:655 g10/keyserver.c:1232 g10/revoke.c:232
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "找不到金鑰 \"%s\": %s\n"
- #: g10/delkey.c:87 g10/export.c:870 g10/getkey.c:3136 g10/keyedit.c:2376
- #: g10/keyserver.c:1250 g10/revoke.c:233 g10/revoke.c:622
++#: g10/delkey.c:89 g10/export.c:954 g10/getkey.c:1206 g10/getkey.c:3211
++#: g10/gpg.c:2236 g10/gpg.c:2308 g10/gpg.c:4834 g10/keyedit.c:2403
++#: g10/keyserver.c:1250 g10/revoke.c:238 g10/revoke.c:638
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "讀取金鑰區塊時出錯: %s\n"
- #: g10/delkey.c:128 g10/delkey.c:135
++#: g10/delkey.c:119 g10/gpg.c:2215
+ #, fuzzy, c-format
+ #| msgid "key \"%s\" not found: %s\n"
+ msgid "key \"%s\" not found\n"
+ msgstr "找不到金鑰 \"%s\": %s\n"
+
++#: g10/delkey.c:130 g10/delkey.c:137
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(除非你用指紋指定了金鑰)\n"
- #: g10/delkey.c:134
++#: g10/delkey.c:136
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
- #: g10/delkey.c:147
++#: g10/delkey.c:149
msgid "Delete this key from the keyring? (y/N) "
msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
- #: g10/delkey.c:157
++#: g10/delkey.c:159
msgid "This is a secret key! - really delete? (y/N) "
msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
- #: g10/delkey.c:194
++#: g10/delkey.c:196
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "刪除私鑰 %s 時失敗: %s\n"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "key"
msgstr "金鑰"
- #: g10/delkey.c:196
++#: g10/delkey.c:198
msgid "subkey"
msgstr "子鑰"
- #: g10/delkey.c:216
++#: g10/delkey.c:218
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "刪除金鑰區塊時失敗: %s\n"
- #: g10/delkey.c:229
++#: g10/delkey.c:231
msgid "ownertrust information cleared\n"
msgstr "主觀信任資訊已清除\n"
- #: g10/delkey.c:265
++#: g10/delkey.c:267
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
- #: g10/delkey.c:267
++#: g10/delkey.c:269
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
- #: g10/encrypt.c:226 g10/sign.c:1260
++#: g10/encrypt.c:226 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "建立密語時出錯: %s\n"
@@@ -2009,7 -1546,6 +2015,7 @@@ msgstr "警告: 強迫使用 %s (%d) �
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
- #: g10/encrypt.c:881 g10/pkclist.c:933 g10/pkclist.c:983
++#: g10/encrypt.c:881 g10/pkclist.c:934 g10/pkclist.c:984
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "你不能夠將 %s 用於 %s 模式中\n"
@@@ -2089,263 -1609,217 +2095,284 @@@ msgstr "警告: 無法移除暫存檔 (
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
- #: g10/export.c:63
++#: g10/export.c:77
msgid "export signatures that are marked as local-only"
msgstr "匯出標記為僅限本機使用的簽章"
- #: g10/export.c:65
++#: g10/export.c:79
msgid "export attribute user IDs (generally photo IDs)"
msgstr "匯出署名使用者 ID (通常是照片 ID)"
- #: g10/export.c:67
++#: g10/export.c:81
msgid "export revocation keys marked as \"sensitive\""
msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
- #: g10/export.c:69
++#: g10/export.c:83
msgid "remove unusable parts from key during export"
msgstr "匯出時從金鑰中移除無法使用的部分"
- #: g10/export.c:71
++#: g10/export.c:85
msgid "remove as much as possible from key during export"
msgstr "匯出時盡可能地從金鑰中移除"
- #: g10/export.c:814
++#: g10/export.c:902
msgid "exporting secret keys not allowed\n"
msgstr "不允許匯出私鑰\n"
- #: g10/export.c:895
++#: g10/export.c:980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
- #: g10/export.c:1081
++#: g10/export.c:1167
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
- #: g10/export.c:1179
++#: g10/export.c:1275
msgid " - skipped"
msgstr " - 已跳過"
- #: g10/export.c:1235
++#: g10/export.c:1337
msgid "WARNING: nothing exported\n"
msgstr "警告: 沒有匯出任何東西\n"
- #: g10/getkey.c:230
++#: g10/getkey.c:234
msgid "[User ID not found]"
msgstr "[找不到使用者 ID]"
- #: g10/getkey.c:1012
++#: g10/getkey.c:1034
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "已自動取回 '%s' (經由 %s )\n"
- #: g10/getkey.c:1018
++#: g10/getkey.c:1040
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
- #: g10/getkey.c:1020
++#: g10/getkey.c:1042
msgid "No fingerprint"
msgstr "沒有指紋"
- #: g10/getkey.c:1777
++#: g10/getkey.c:1175 g10/keyedit.c:2428 g10/revoke.c:630 g10/revoke.c:695
+ #, c-format
+ msgid "secret key \"%s\" not found: %s\n"
+ msgstr "找不到私鑰 \"%s\": %s\n"
+
++#: g10/getkey.c:1178 g10/gpg.c:2179 g10/gpg.c:2217 g10/gpg.c:2301
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "(check argument of option '%s')\n"
+ msgstr "\"%.50s\" 選項遺失了引數\n"
+
++#: g10/getkey.c:1216
+ #, fuzzy, c-format
+ #| msgid "|NAME|use NAME as default secret key"
+ msgid "using \"%s\" as default secret key\n"
+ msgstr "|名字|使用指定名字做為預設私鑰"
+
++#: g10/getkey.c:1890
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
- #: g10/getkey.c:2588
++#: g10/getkey.c:2701
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子鑰 %s 來替換主鑰 %s\n"
- #: g10/gpg.c:397 sm/gpgsm.c:195
++#: g10/gpg.c:405 sm/gpgsm.c:195
msgid "make a signature"
msgstr "建立簽章"
- #: g10/gpg.c:398
++#: g10/gpg.c:406
msgid "make a clear text signature"
msgstr "建立明文簽章"
- #: g10/gpg.c:399 sm/gpgsm.c:197
++#: g10/gpg.c:407 sm/gpgsm.c:197
msgid "make a detached signature"
msgstr "建立分離式簽章"
- #: g10/gpg.c:400 sm/gpgsm.c:198
++#: g10/gpg.c:408 sm/gpgsm.c:198
msgid "encrypt data"
msgstr "加密資料"
- #: g10/gpg.c:402
++#: g10/gpg.c:410
msgid "encryption only with symmetric cipher"
msgstr "僅使用對稱式編密法來加密"
- #: g10/gpg.c:404 sm/gpgsm.c:200
++#: g10/gpg.c:412 sm/gpgsm.c:200
msgid "decrypt data (default)"
msgstr "資料解密 (預設)"
- #: g10/gpg.c:406 sm/gpgsm.c:201
++#: g10/gpg.c:414 sm/gpgsm.c:201
msgid "verify a signature"
msgstr "驗證簽章"
- #: g10/gpg.c:408 sm/gpgsm.c:202
++#: g10/gpg.c:416 sm/gpgsm.c:202
msgid "list keys"
msgstr "列出金鑰"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "list keys and signatures"
msgstr "列出金鑰和簽章"
- #: g10/gpg.c:411
++#: g10/gpg.c:419
msgid "list and check key signatures"
msgstr "列出並檢查金鑰簽章"
- #: g10/gpg.c:412 sm/gpgsm.c:207
++#: g10/gpg.c:420 sm/gpgsm.c:207
msgid "list keys and fingerprints"
msgstr "列出金鑰和指紋"
- #: g10/gpg.c:413 sm/gpgsm.c:205
++#: g10/gpg.c:421 sm/gpgsm.c:205
msgid "list secret keys"
msgstr "列出私鑰"
- #: g10/gpg.c:415 sm/gpgsm.c:208
++#: g10/gpg.c:423 sm/gpgsm.c:208
msgid "generate a new key pair"
msgstr "產生新的金鑰對"
- #: g10/gpg.c:417
++#: g10/gpg.c:425
msgid "quickly generate a new key pair"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:419
++#: g10/gpg.c:427
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly add a new user-id"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:421
++#: g10/gpg.c:429
msgid "full featured key pair generation"
msgstr "全能金鑰對生成"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "generate a revocation certificate"
msgstr "產生撤銷憑證"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "remove keys from the public keyring"
msgstr "從公鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:426
++#: g10/gpg.c:434
msgid "remove keys from the secret keyring"
msgstr "從私鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:428
++#: g10/gpg.c:436
msgid "quickly sign a key"
msgstr "快速簽署金鑰"
- #: g10/gpg.c:430
++#: g10/gpg.c:438
msgid "quickly sign a key locally"
msgstr "快速在本機簽署金鑰"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "sign a key"
msgstr "簽署金鑰"
- #: g10/gpg.c:432
++#: g10/gpg.c:440
msgid "sign a key locally"
msgstr "僅在本機簽署金鑰"
- #: g10/gpg.c:433
++#: g10/gpg.c:441
msgid "sign or edit a key"
msgstr "簽署或編輯金鑰"
- #: g10/gpg.c:435 sm/gpgsm.c:228
++#: g10/gpg.c:443 sm/gpgsm.c:228
msgid "change a passphrase"
msgstr "更改密語"
- #: g10/gpg.c:437
++#: g10/gpg.c:445
msgid "export keys"
msgstr "匯出金鑰"
- #: g10/gpg.c:438
++#: g10/gpg.c:446
msgid "export keys to a key server"
msgstr "把金鑰匯出至金鑰伺服器"
- #: g10/gpg.c:439
++#: g10/gpg.c:447
msgid "import keys from a key server"
msgstr "從金鑰伺服器匯入金鑰"
- #: g10/gpg.c:441
++#: g10/gpg.c:449
msgid "search for keys on a key server"
msgstr "在金鑰伺服器上搜尋金鑰"
- #: g10/gpg.c:443
++#: g10/gpg.c:451
msgid "update all keys from a keyserver"
msgstr "從金鑰伺服器更新所有的金鑰"
- #: g10/gpg.c:448
++#: g10/gpg.c:456
msgid "import/merge keys"
msgstr "匯入/合併金鑰"
- #: g10/gpg.c:451
++#: g10/gpg.c:459
msgid "print the card status"
msgstr "列印卡片狀態"
- #: g10/gpg.c:452
++#: g10/gpg.c:460
msgid "change data on a card"
msgstr "變更卡片上的資料"
- #: g10/gpg.c:453
++#: g10/gpg.c:461
msgid "change a card's PIN"
msgstr "變更卡片的個人識別碼 (PIN)"
- #: g10/gpg.c:465
++#: g10/gpg.c:473
msgid "update the trust database"
msgstr "更新信任資料庫"
- #: g10/gpg.c:474
++#: g10/gpg.c:482
msgid "print message digests"
msgstr "印出訊息摘要"
- #: g10/gpg.c:477 sm/gpgsm.c:223
++#: g10/gpg.c:485 sm/gpgsm.c:223
msgid "run in server mode"
msgstr "以伺服器模式執行"
- #: g10/gpg.c:481 sm/gpgsm.c:241
++#: g10/gpg.c:487
+ msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgstr ""
+
++#: g10/gpg.c:491 sm/gpgsm.c:241
msgid "create ascii armored output"
msgstr "建立以 ASCII 封裝過的輸出"
- #: g10/gpg.c:484 sm/gpgsm.c:254
++#: g10/gpg.c:494 sm/gpgsm.c:254
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
- #: g10/gpg.c:497 sm/gpgsm.c:290
++#: g10/gpg.c:508 sm/gpgsm.c:290
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
- #: g10/gpg.c:502
++#: g10/gpg.c:513
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
- #: g10/gpg.c:508
++#: g10/gpg.c:519
msgid "use canonical text mode"
msgstr "使用標準的文字模式"
- #: g10/gpg.c:525 sm/gpgsm.c:292
++#: g10/gpg.c:536 sm/gpgsm.c:292
msgid "|FILE|write output to FILE"
msgstr "|檔案|將輸出寫入至指定檔案"
- #: g10/gpg.c:537 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:548 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "不要做任何改變"
- #: g10/gpg.c:538
++#: g10/gpg.c:549
msgid "prompt before overwriting"
msgstr "覆寫前先詢問"
- #: g10/gpg.c:583
++#: g10/gpg.c:594
msgid "use strict OpenPGP behavior"
msgstr "使用嚴謹的 OpenPGP 行為"
- #: g10/gpg.c:609 sm/gpgsm.c:348
++#: g10/gpg.c:620 sm/gpgsm.c:348
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2353,7 -1827,6 +2380,7 @@@ msgstr "
"@\n"
"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:612 sm/gpgsm.c:351
++#: g10/gpg.c:623 sm/gpgsm.c:351
msgid ""
"@\n"
"Examples:\n"
@@@ -2373,11 -1846,9 +2400,11 @@@ msgstr "
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:967
++#: g10/gpg.c:983
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
- #: g10/gpg.c:970
++#: g10/gpg.c:986
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2387,7 -1858,6 +2414,7 @@@ msgstr "
"簽署, 檢查, 加密, 解密\n"
"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:981 sm/gpgsm.c:580
++#: g10/gpg.c:997 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2395,561 -1865,494 +2422,633 @@@ msgstr "
"\n"
"已支援的演算法:\n"
- #: g10/gpg.c:984
++#: g10/gpg.c:1000
msgid "Pubkey: "
msgstr "公鑰: "
- #: g10/gpg.c:991 g10/keyedit.c:2635
++#: g10/gpg.c:1007 g10/keyedit.c:2662
msgid "Cipher: "
msgstr "編密法: "
- #: g10/gpg.c:998
++#: g10/gpg.c:1014
msgid "Hash: "
msgstr "雜湊: "
- #: g10/gpg.c:1005 g10/keyedit.c:2684
++#: g10/gpg.c:1021 g10/keyedit.c:2711
msgid "Compression: "
msgstr "壓縮: "
- #: g10/gpg.c:1074 sm/gpgsm.c:654
++#: g10/gpg.c:1090 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法: %s [選項] %s\n"
- #: g10/gpg.c:1274 sm/gpgsm.c:743
++#: g10/gpg.c:1290 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
- #: g10/gpg.c:1292
++#: g10/gpg.c:1308
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
- #: g10/gpg.c:1489
++#: g10/gpg.c:1505
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1492
++#: g10/gpg.c:1508
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1495
++#: g10/gpg.c:1511
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1501
++#: g10/gpg.c:1517
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1504
++#: g10/gpg.c:1520
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1523
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1516
++#: g10/gpg.c:1532
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1528
++#: g10/gpg.c:1544
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1738
++#: g10/gpg.c:1754
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "未知的組態項目 '%s'\n"
- #: g10/gpg.c:1845
++#: g10/gpg.c:1861
msgid "display photo IDs during key listings"
msgstr "列出金鑰時顯示照片 ID"
- #: g10/gpg.c:1847
++#: g10/gpg.c:1863
msgid "show key usage information during key listings"
msgstr "列出金鑰時顯示金鑰用途資訊"
- #: g10/gpg.c:1849
++#: g10/gpg.c:1865
msgid "show policy URLs during signature listings"
msgstr "列出簽章時顯示原則 URL"
- #: g10/gpg.c:1851
++#: g10/gpg.c:1867
msgid "show all notations during signature listings"
msgstr "列出簽章時顯示所有的註記"
- #: g10/gpg.c:1853
++#: g10/gpg.c:1869
msgid "show IETF standard notations during signature listings"
msgstr "列出簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:1857
++#: g10/gpg.c:1873
msgid "show user-supplied notations during signature listings"
msgstr "列出簽章時顯示使用者提供的註記"
- #: g10/gpg.c:1859
++#: g10/gpg.c:1875
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:1861
++#: g10/gpg.c:1877
msgid "show user ID validity during key listings"
msgstr "列出金鑰時顯示使用者 ID 有效性"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1879
msgid "show revoked and expired user IDs in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1881
msgid "show revoked and expired subkeys in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1883
msgid "show the keyring name in key listings"
msgstr "在金鑰清單中顯示鑰匙圈名稱"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1885
msgid "show expiration dates during signature listings"
msgstr "列出簽章時顯示有效期限"
- #: g10/gpg.c:2006
++#: g10/gpg.c:1987
+ #, fuzzy
+ #| msgid "Available keys:\n"
+ msgid "available TOFU policies:\n"
+ msgstr "可用金鑰:\n"
+
++#: g10/gpg.c:1998
+ #, fuzzy, c-format
+ #| msgid "unknown option '%s'\n"
+ msgid "unknown TOFU policy '%s'\n"
+ msgstr "未知的選項 '%s'\n"
+
++#: g10/gpg.c:2000 g10/gpg.c:2024
+ msgid "(use \"help\" to list choices)\n"
+ msgstr ""
+
++#: g10/gpg.c:2022
+ #, fuzzy, c-format
+ #| msgid "unknown command '%s'\n"
+ msgid "unknown TOFU DB format '%s'\n"
+ msgstr "未知的指令 '%s'\n"
+
++#: g10/gpg.c:2085
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
- #: g10/gpg.c:2100
++#: g10/gpg.c:2188
+ #, c-format
+ msgid ""
+ "Warning: value '%s' for option '%s' should be a long key ID or a "
+ "fingerprint\n"
+ msgstr ""
+
++#: g10/gpg.c:2299
+ #, fuzzy, c-format
+ #| msgid "option \"%.50s\" is ambiguous\n"
+ msgid "key specification '%s' is ambiguous\n"
+ msgstr "\"%.50s\" 選項不明確\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Two
+ #. lines with fingerprints are printed after this message.
++#: g10/gpg.c:2319
+ #, c-format
+ msgid "'%s' matches at least:\n"
+ msgstr ""
+
++#: g10/gpg.c:2330 g10/revoke.c:682
+ #, fuzzy, c-format
+ #| msgid "error creating keyring '%s': %s\n"
+ msgid "error searching the keyring: %s\n"
+ msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
+
++#: g10/gpg.c:2423
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
- #: g10/gpg.c:2558 g10/gpg.c:3269 g10/gpg.c:3281
++#: g10/gpg.c:2901 g10/gpg.c:3637 g10/gpg.c:3649
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "請注意: 一般情況下不採用 %s!\n"
- #: g10/gpg.c:2729 g10/gpg.c:2741
++#: g10/gpg.c:3085 g10/gpg.c:3097
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' 不是有效的簽章使用期限\n"
- #: g10/gpg.c:2779
++#: g10/gpg.c:3138
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無效的個人識別碼項目模式 '%s'\n"
- #: g10/gpg.c:2832
++#: g10/gpg.c:3191
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' 不是有效的字元集\n"
- #: g10/gpg.c:2854 g10/gpg.c:3050 g10/keyedit.c:4446
++#: g10/gpg.c:3213 g10/gpg.c:3409 g10/keyedit.c:4491
msgid "could not parse keyserver URL\n"
msgstr "無法剖析金鑰伺服器 URL\n"
- #: g10/gpg.c:2872
++#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無效的金鑰伺服器選項\n"
- #: g10/gpg.c:2875
++#: g10/gpg.c:3234
msgid "invalid keyserver options\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/gpg.c:2882
++#: g10/gpg.c:3241
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無效的匯入選項\n"
- #: g10/gpg.c:2885
++#: g10/gpg.c:3244
msgid "invalid import options\n"
msgstr "無效的匯入選項\n"
- #: g10/gpg.c:2892
++#: g10/gpg.c:3251
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無效的匯出選項\n"
- #: g10/gpg.c:2895
++#: g10/gpg.c:3254
msgid "invalid export options\n"
msgstr "無效的匯出選項\n"
- #: g10/gpg.c:2902
++#: g10/gpg.c:3261
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無效的清單選項\n"
- #: g10/gpg.c:2905
++#: g10/gpg.c:3264
msgid "invalid list options\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:2913
++#: g10/gpg.c:3272
msgid "display photo IDs during signature verification"
msgstr "驗證簽章時顯示照片 ID"
- #: g10/gpg.c:2915
++#: g10/gpg.c:3274
msgid "show policy URLs during signature verification"
msgstr "驗證簽章時顯示原則 URL"
- #: g10/gpg.c:2917
++#: g10/gpg.c:3276
msgid "show all notations during signature verification"
msgstr "驗證簽章時顯示所有的註記"
- #: g10/gpg.c:2919
++#: g10/gpg.c:3278
msgid "show IETF standard notations during signature verification"
msgstr "驗證簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:2923
++#: g10/gpg.c:3282
msgid "show user-supplied notations during signature verification"
msgstr "驗證簽章時顯示使用者提供的註記"
- #: g10/gpg.c:2925
++#: g10/gpg.c:3284
msgid "show preferred keyserver URLs during signature verification"
msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:2927
++#: g10/gpg.c:3286
msgid "show user ID validity during signature verification"
msgstr "驗證簽章時顯示使用者 ID 有效性"
- #: g10/gpg.c:2929
++#: g10/gpg.c:3288
msgid "show revoked and expired user IDs in signature verification"
msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:2931
++#: g10/gpg.c:3290
msgid "show only the primary user ID in signature verification"
msgstr "驗證簽章時祇顯示主要的使用者 ID"
- #: g10/gpg.c:2933
++#: g10/gpg.c:3292
msgid "validate signatures with PKA data"
msgstr "以 PKA 資料驗證簽章"
- #: g10/gpg.c:2935
++#: g10/gpg.c:3294
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提高對持有有效 PKA 資料之簽章的信任"
- #: g10/gpg.c:2942
++#: g10/gpg.c:3301
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無效的驗證選項\n"
- #: g10/gpg.c:2945
++#: g10/gpg.c:3304
msgid "invalid verify options\n"
msgstr "無效的驗證選項\n"
- #: g10/gpg.c:2952
++#: g10/gpg.c:3311
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "無法把執行檔路徑設成 %s\n"
- #: g10/gpg.c:3134
++#: g10/gpg.c:3502
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3137
++#: g10/gpg.c:3505
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3258 sm/gpgsm.c:1487
++#: g10/gpg.c:3626 sm/gpgsm.c:1487
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3630
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/gpg.c:3271
++#: g10/gpg.c:3639
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不允許跟 %s 併用!\n"
- #: g10/gpg.c:3274
++#: g10/gpg.c:3642
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
- #: g10/gpg.c:3289 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1014
++#: g10/gpg.c:3657 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "警告: 正在偽造的系統時間中執行: "
- #: g10/gpg.c:3310
++#: g10/gpg.c:3678
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
- #: g10/gpg.c:3345 g10/gpg.c:3369 sm/gpgsm.c:1569
++#: g10/gpg.c:3713 g10/gpg.c:3737 sm/gpgsm.c:1569
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
- #: g10/gpg.c:3351 g10/gpg.c:3375 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3719 g10/gpg.c:3743 sm/gpgsm.c:1575 sm/gpgsm.c:1581
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3725
msgid "selected compression algorithm is invalid\n"
msgstr "所選的壓縮演算法無效\n"
- #: g10/gpg.c:3363
++#: g10/gpg.c:3731
msgid "selected certification digest algorithm is invalid\n"
msgstr "所選的憑證摘要演算法無效\n"
- #: g10/gpg.c:3378
++#: g10/gpg.c:3746
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed 一定要大於 0\n"
- #: g10/gpg.c:3380
++#: g10/gpg.c:3748
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed 一定要大於 1\n"
- #: g10/gpg.c:3382
++#: g10/gpg.c:3750
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
- #: g10/gpg.c:3384
++#: g10/gpg.c:3752
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3754
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
- #: g10/gpg.c:3389
++#: g10/gpg.c:3757
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3761
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
- #: g10/gpg.c:3400
++#: g10/gpg.c:3768
msgid "invalid default preferences\n"
msgstr "無效的預設偏好\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3772
msgid "invalid personal cipher preferences\n"
msgstr "無效的個人編密法偏好\n"
- #: g10/gpg.c:3408
++#: g10/gpg.c:3776
msgid "invalid personal digest preferences\n"
msgstr "無效的個人摘要偏好\n"
- #: g10/gpg.c:3412
++#: g10/gpg.c:3780
msgid "invalid personal compress preferences\n"
msgstr "無效的個人壓縮偏好\n"
- #: g10/gpg.c:3445
++#: g10/gpg.c:3816
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
- #: g10/gpg.c:3492
++#: g10/gpg.c:3863
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
- #: g10/gpg.c:3497
++#: g10/gpg.c:3868
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
- #: g10/gpg.c:3502
++#: g10/gpg.c:3873
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3966
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信任資料庫啟始失敗: %s\n"
- #: g10/gpg.c:3607
++#: g10/gpg.c:3978
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
- #: g10/gpg.c:3662
++#: g10/gpg.c:4047
+ #, 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/gpg.c:4050
+ #, fuzzy, c-format
+ #| msgid "line %d: invalid date given\n"
+ msgid "option '%s' given, but option '%s' not given\n"
+ msgstr "第 %d 列: 無效的給定日期\n"
+
++#: g10/gpg.c:4064
msgid "--store [filename]"
msgstr "--store [檔名]"
- #: g10/gpg.c:3672
++#: g10/gpg.c:4074
msgid "--symmetric [filename]"
msgstr "--symmetric [檔名]"
- #: g10/gpg.c:3676
++#: g10/gpg.c:4078
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s' 對稱式加密失敗: %s\n"
- #: g10/gpg.c:3687
++#: g10/gpg.c:4089
msgid "--encrypt [filename]"
msgstr "--encrypt [檔名]"
- #: g10/gpg.c:3703
++#: g10/gpg.c:4105
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [檔名]"
- #: g10/gpg.c:3705
++#: g10/gpg.c:4107
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3708
++#: g10/gpg.c:4110
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:4131
msgid "--sign [filename]"
msgstr "--sign [檔名]"
- #: g10/gpg.c:3745
++#: g10/gpg.c:4147
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [檔名]"
- #: g10/gpg.c:3763
++#: g10/gpg.c:4165
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [檔名]"
- #: g10/gpg.c:3765
++#: g10/gpg.c:4167
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:4170
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3792
++#: g10/gpg.c:4194
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [檔名]"
- #: g10/gpg.c:3804
++#: g10/gpg.c:4206
msgid "--clearsign [filename]"
msgstr "--clearsign [檔名]"
- #: g10/gpg.c:3835
++#: g10/gpg.c:4237
msgid "--decrypt [filename]"
msgstr "--decrypt [檔名]"
- #: g10/gpg.c:3862
++#: g10/gpg.c:4264
msgid "--sign-key user-id"
msgstr "--sign-key 使用者ID"
- #: g10/gpg.c:3866
++#: g10/gpg.c:4268
msgid "--lsign-key user-id"
msgstr "--lsign-key 使用者ID"
- #: g10/gpg.c:3887
++#: g10/gpg.c:4289
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 使用者ID [指令]"
- #: g10/gpg.c:3903
++#: g10/gpg.c:4305
msgid "--passwd <user-id>"
msgstr "--passwd 使用者ID"
- #: g10/gpg.c:4036 g10/keyserver.c:1822
++#: g10/gpg.c:4443 g10/keyserver.c:1826
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "送至金鑰伺服器失敗: %s\n"
- #: g10/gpg.c:4041
++#: g10/gpg.c:4448
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "從金鑰伺服器接收失敗: %s\n"
- #: g10/gpg.c:4047
++#: g10/gpg.c:4454
#, c-format
msgid "key export failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4061
++#: g10/gpg.c:4468
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "用金鑰伺服器搜尋失敗: %s\n"
- #: g10/gpg.c:4074
++#: g10/gpg.c:4481
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "從金鑰伺服器更新失敗: %s\n"
- #: g10/gpg.c:4131
++#: g10/gpg.c:4548
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解開封裝失敗: %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4559
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "進行封裝失敗: %s\n"
- #: g10/gpg.c:4234
++#: g10/gpg.c:4651
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無效的雜湊演算法 '%s'\n"
- #: g10/gpg.c:4358
++#: g10/gpg.c:4795
+ #, 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:4807
+ #, c-format
+ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+ msgstr ""
+
++#: g10/gpg.c:4854
msgid "[filename]"
msgstr "[檔名]"
- #: g10/gpg.c:4364
++#: g10/gpg.c:4860
msgid "Go ahead and type your message ...\n"
msgstr "請開始輸入你的訊息 ...\n"
- #: g10/gpg.c:4702
++#: g10/gpg.c:5198
msgid "the given certification policy URL is invalid\n"
msgstr "給定的的憑證原則 URL 無效\n"
- #: g10/gpg.c:4704
++#: g10/gpg.c:5200
msgid "the given signature policy URL is invalid\n"
msgstr "給定的簽章原則 URL 無效\n"
- #: g10/gpg.c:4737
++#: g10/gpg.c:5233
msgid "the given preferred keyserver URL is invalid\n"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
- #: g10/gpgv.c:74
++#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
- #: g10/gpgv.c:76
++#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "僅把時間戳印矛盾視為警告"
- #: g10/gpgv.c:78 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:338
msgid "|FD|write status info to this FD"
msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
- #: g10/gpgv.c:117
++#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
- #: g10/gpgv.c:119
++#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -3122,7 -2491,6 +3221,7 @@@ msgstr "散佈此金鑰, 以避免潛�
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:984 g10/import.c:1690
++#: g10/import.c:984 g10/import.c:1707
#, c-format
msgid "key %s: no user ID\n"
msgstr "金鑰 %s: 沒有使用者 ID\n"
@@@ -3132,7 -2499,6 +3231,7 @@@
msgid "key %s: %s\n"
msgstr "金鑰 %s: %s\n"
- #: g10/import.c:991 g10/import.c:1664
++#: g10/import.c:991 g10/import.c:1681
msgid "rejected by import screener"
msgstr "遭到匯入篩選程式駁回"
@@@ -3155,7 -2517,6 +3254,7 @@@ msgstr "金鑰 %s: 沒有有效的使�
msgid "this may be caused by a missing self-signature\n"
msgstr "這可能肇因於遺失自我簽章所致\n"
- #: g10/import.c:1062 g10/import.c:1815
++#: g10/import.c:1062 g10/import.c:1851
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "金鑰 %s: 找不到公鑰: %s\n"
@@@ -3165,202 -2525,175 +3264,217 @@@
msgid "key %s: new key - skipped\n"
msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
- #: g10/import.c:1079
++#: g10/import.c:1083
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可寫入的鑰匙圈: %s\n"
- #: g10/import.c:1084 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
- #: g10/sign.c:1116
++#: g10/import.c:1088 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "正在寫入 '%s'\n"
- #: g10/import.c:1088 g10/import.c:1184 g10/import.c:1875
++#: g10/import.c:1092 g10/import.c:1193 g10/import.c:1917
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/import.c:1108
++#: g10/import.c:1112
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
- #: g10/import.c:1132
++#: g10/import.c:1136
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "金鑰 %s: 跟我們的副本不吻合\n"
- #: g10/import.c:1143 g10/import.c:1833
++#: g10/import.c:1152 g10/import.c:1875
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
- #: g10/import.c:1151 g10/import.c:1840
++#: g10/import.c:1160 g10/import.c:1882
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
- #: g10/import.c:1194
++#: g10/import.c:1203
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
- #: g10/import.c:1197
++#: g10/import.c:1206
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
- #: g10/import.c:1200
++#: g10/import.c:1209
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
- #: g10/import.c:1203
++#: g10/import.c:1212
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
- #: g10/import.c:1206
++#: g10/import.c:1215
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
- #: g10/import.c:1209
++#: g10/import.c:1218
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
- #: g10/import.c:1212
++#: g10/import.c:1221
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1215
++#: g10/import.c:1224
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1218
++#: g10/import.c:1227
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1221
++#: g10/import.c:1230
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1244
++#: g10/import.c:1253
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "金鑰 %s: \"%s\" 未改變\n"
- #: g10/import.c:1548 g10/import.c:1765
++#: g10/import.c:1561 g10/import.c:1801
#, c-format
msgid "key %s: secret key imported\n"
msgstr "金鑰 %s: 私鑰已匯入\n"
- #: g10/import.c:1555
++#: g10/import.c:1568
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "金鑰 %s: 私鑰已存在\n"
- #: g10/import.c:1562
++#: g10/import.c:1575
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
- #: g10/import.c:1663
++#: g10/import.c:1680
#, c-format
msgid "secret key %s: %s\n"
msgstr "私鑰 %s: %s\n"
- #: g10/import.c:1683 g10/import.c:1718
++#: g10/import.c:1700 g10/import.c:1735
msgid "importing secret keys not allowed\n"
msgstr "未允許匯入私鑰\n"
- #: g10/import.c:1707
++#: g10/import.c:1724
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
- #: g10/import.c:1808
+ #. 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:1793
+ #, c-format
+ msgid "To migrate '%s', with each smartcard, run: %s\n"
+ msgstr ""
+
++#: g10/import.c:1844
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
- #: g10/import.c:1851
++#: g10/import.c:1893
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
- #: g10/import.c:1884
++#: g10/import.c:1926
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
- #: g10/import.c:1960
++#: g10/import.c:2002
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
- #: g10/import.c:1977
++#: g10/import.c:2019
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
- #: g10/import.c:1979
++#: g10/import.c:2021
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
- #: g10/import.c:1996 g10/import.c:2022 g10/import.c:2073
++#: g10/import.c:2038 g10/import.c:2064 g10/import.c:2115
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "金鑰 %s: 未支援的公鑰演算法\n"
- #: g10/import.c:1997
++#: g10/import.c:2039
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
- #: g10/import.c:2011
++#: g10/import.c:2053
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
- #: g10/import.c:2024
++#: g10/import.c:2066
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "金鑰 %s: 無效的附帶子鑰\n"
- #: g10/import.c:2040
++#: g10/import.c:2082
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
- #: g10/import.c:2062
++#: g10/import.c:2104
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
- #: g10/import.c:2075
++#: g10/import.c:2117
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "金鑰 %s: 無效的子鑰撤銷\n"
- #: g10/import.c:2090
++#: g10/import.c:2132
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
- #: g10/import.c:2135
++#: g10/import.c:2177
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
- #: g10/import.c:2158
++#: g10/import.c:2200
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "金鑰 %s: 子鑰已跳過\n"
@@@ -3369,52 -2702,42 +3483,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:2187
++#: g10/import.c:2229
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
- #: g10/import.c:2198
++#: g10/import.c:2240
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2216
++#: g10/import.c:2258
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
- #: g10/import.c:2230
++#: g10/import.c:2272
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2238
++#: g10/import.c:2280
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
- #: g10/import.c:2367
++#: g10/import.c:2409
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
- #: g10/import.c:2431
++#: g10/import.c:2473
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
- #: g10/import.c:2447
++#: g10/import.c:2489
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
- #: g10/import.c:2511
++#: g10/import.c:2553
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
- #: g10/import.c:2549
++#: g10/import.c:2591
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
@@@ -3439,61 -2758,53 +3553,67 @@@ msgstr "鑰匙盒 '%s' 已建立\n
msgid "keyring '%s' created\n"
msgstr "鑰匙圈 '%s' 已建立\n"
- #: g10/keydb.c:678
++#: g10/keydb.c:740
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "金鑰區塊資源 '%s': %s\n"
- #: g10/keydb.c:1516
++#: g10/keydb.c:825
+ #, fuzzy, c-format
+ #| msgid "error opening '%s': %s\n"
+ msgid "error opening key DB: %s\n"
+ msgstr "開啟 '%s' 時出錯: %s\n"
+
++#: g10/keydb.c:1599
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立鑰匙圈快取失敗: %s\n"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[撤銷]"
- #: g10/keyedit.c:259
++#: g10/keyedit.c:261
msgid "[self-signature]"
msgstr "[自我簽章]"
- #: g10/keyedit.c:378 g10/keylist.c:451
++#: g10/keyedit.c:380 g10/keylist.c:473
msgid "1 bad signature\n"
msgstr "1 份損壞的簽章\n"
- #: g10/keyedit.c:380 g10/keylist.c:453
++#: g10/keyedit.c:382 g10/keylist.c:475
#, c-format
msgid "%d bad signatures\n"
msgstr "%d 份損壞的簽章\n"
- #: g10/keyedit.c:382 g10/keylist.c:456
++#: g10/keyedit.c:384 g10/keylist.c:478
msgid "1 signature not checked due to a missing key\n"
msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
- #: g10/keyedit.c:384 g10/keylist.c:458
++#: g10/keyedit.c:386 g10/keylist.c:480
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
- #: g10/keyedit.c:386 g10/keylist.c:461
++#: g10/keyedit.c:388 g10/keylist.c:483
msgid "1 signature not checked due to an error\n"
msgstr "有 1 份簽章因錯誤而未被檢查\n"
- #: g10/keyedit.c:388 g10/keylist.c:463
++#: g10/keyedit.c:390 g10/keylist.c:485
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "有 %d 份簽章因錯誤而未被檢查\n"
- #: g10/keyedit.c:390
++#: g10/keyedit.c:392
msgid "1 user ID without valid self-signature detected\n"
msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
- #: g10/keyedit.c:392
++#: g10/keyedit.c:394
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
- #: g10/keyedit.c:452 g10/pkclist.c:275
++#: g10/keyedit.c:454 g10/pkclist.c:276
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3503,17 -2814,14 +3623,17 @@@ msgstr "
"請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
"(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
- #: g10/keyedit.c:456 g10/pkclist.c:287
++#: g10/keyedit.c:458 g10/pkclist.c:288
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉強信任\n"
- #: g10/keyedit.c:457 g10/pkclist.c:289
++#: g10/keyedit.c:459 g10/pkclist.c:290
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全信任\n"
- #: g10/keyedit.c:475
++#: g10/keyedit.c:477
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3523,45 -2831,38 +3643,50 @@@ msgstr "
"深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
"同時也信任這把金鑰所簽署的信任簽章.\n"
- #: g10/keyedit.c:491
++#: g10/keyedit.c:493
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
- #: g10/keyedit.c:618
++#: g10/keyedit.c:621
+ #, c-format
+ msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+ msgstr ""
+
++#: g10/keyedit.c:629
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "使用者 ID \"%s\" 已撤銷."
- #: g10/keyedit.c:627 g10/keyedit.c:655 g10/keyedit.c:682 g10/keyedit.c:858
- #: g10/keyedit.c:1734
++#: g10/keyedit.c:638 g10/keyedit.c:666 g10/keyedit.c:693 g10/keyedit.c:869
++#: g10/keyedit.c:1745
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "你仍然想要簽署它嗎? (y/N) "
- #: g10/keyedit.c:641 g10/keyedit.c:669 g10/keyedit.c:696 g10/keyedit.c:864
- #: g10/keyedit.c:1739 g10/keyedit.c:2516
++#: g10/keyedit.c:652 g10/keyedit.c:680 g10/keyedit.c:707 g10/keyedit.c:875
++#: g10/keyedit.c:1750 g10/keyedit.c:2543
msgid " Unable to sign.\n"
msgstr " 無法簽署.\n"
- #: g10/keyedit.c:646
++#: g10/keyedit.c:657
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "使用者 ID \"%s\" 已過期."
- #: g10/keyedit.c:674
++#: g10/keyedit.c:685
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "使用者 ID \"%s\" 未經自我簽署."
- #: g10/keyedit.c:703
++#: g10/keyedit.c:714
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "使用者 ID \"%s\" 可被簽署."
- #: g10/keyedit.c:705
++#: g10/keyedit.c:716
msgid "Sign it? (y/N) "
msgstr "是否要簽署? (y/N) "
- #: g10/keyedit.c:732
++#: g10/keyedit.c:743
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3570,11 -2871,9 +3695,11 @@@ msgstr "
"\"%s\" 裡的自我簽章\n"
"是 PGP 2.x 型態的簽章.\n"
- #: g10/keyedit.c:741
++#: g10/keyedit.c:752
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
- #: g10/keyedit.c:754
++#: g10/keyedit.c:765
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3583,11 -2882,9 +3708,11 @@@ msgstr "
"你目前在 \"%s\" 的簽章\n"
"已經過期了.\n"
- #: g10/keyedit.c:759
++#: g10/keyedit.c:770
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
- #: g10/keyedit.c:780
++#: g10/keyedit.c:791
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3596,43 -2893,34 +3721,43 @@@ msgstr "
"你目前在 \"%s\" 的簽章\n"
"是一份本機簽章.\n"
- #: g10/keyedit.c:785
++#: g10/keyedit.c:796
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
- #: g10/keyedit.c:805
++#: g10/keyedit.c:816
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
- #: g10/keyedit.c:809
++#: g10/keyedit.c:820
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
- #: g10/keyedit.c:814
++#: g10/keyedit.c:825
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "你仍然想要再次簽署它嗎? (y/N) "
- #: g10/keyedit.c:836
++#: g10/keyedit.c:847
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "沒有東西可以讓金鑰 %s 簽署\n"
- #: g10/keyedit.c:852
++#: g10/keyedit.c:863
msgid "This key has expired!"
msgstr "這把金鑰已經過期了!"
- #: g10/keyedit.c:870
++#: g10/keyedit.c:881
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "這把金鑰將在 %s 過期.\n"
- #: g10/keyedit.c:876
++#: g10/keyedit.c:887
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
- #: g10/keyedit.c:917
++#: g10/keyedit.c:928
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3641,31 -2929,25 +3766,31 @@@ msgstr "
"你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
"如果你不知道這個問題的答案, 請輸入 \"0\".\n"
- #: g10/keyedit.c:922
++#: g10/keyedit.c:933
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答.%s\n"
- #: g10/keyedit.c:924
++#: g10/keyedit.c:935
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本沒有檢查過.%s\n"
- #: g10/keyedit.c:926
++#: g10/keyedit.c:937
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我隨意檢查過了.%s\n"
- #: g10/keyedit.c:929
++#: g10/keyedit.c:940
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地檢查過了.%s\n"
- #: g10/keyedit.c:936
++#: g10/keyedit.c:947
msgid "Your selection? (enter '?' for more information): "
msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
- #: g10/keyedit.c:963
++#: g10/keyedit.c:974
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3674,224 -2956,169 +3799,224 @@@ msgstr "
"你真的確定要用你的金鑰 \"%s\" (%s)\n"
"來簽署這把金鑰嗎\n"
- #: g10/keyedit.c:971
++#: g10/keyedit.c:982
msgid "This will be a self-signature.\n"
msgstr "這將會是一份自我簽章.\n"
- #: g10/keyedit.c:976
++#: g10/keyedit.c:987
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
- #: g10/keyedit.c:983
++#: g10/keyedit.c:994
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
- #: g10/keyedit.c:993
++#: g10/keyedit.c:1004
msgid "The signature will be marked as non-exportable.\n"
msgstr "這份簽章會被標記成不可匯出.\n"
- #: g10/keyedit.c:1000
++#: g10/keyedit.c:1011
msgid "The signature will be marked as non-revocable.\n"
msgstr "這份簽章會被標記成不可撤銷.\n"
- #: g10/keyedit.c:1007
++#: g10/keyedit.c:1018
msgid "I have not checked this key at all.\n"
msgstr "我根本沒有檢查過這把金鑰.\n"
- #: g10/keyedit.c:1012
++#: g10/keyedit.c:1023
msgid "I have checked this key casually.\n"
msgstr "我隨意檢查過這把金鑰了.\n"
- #: g10/keyedit.c:1017
++#: g10/keyedit.c:1028
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地檢查過這把金鑰了.\n"
- #: g10/keyedit.c:1029
++#: g10/keyedit.c:1040
msgid "Really sign? (y/N) "
msgstr "真的要簽署嗎? (y/N)"
- #: g10/keyedit.c:1080 g10/keyedit.c:5231 g10/keyedit.c:5323 g10/keyedit.c:5388
- #: g10/keyedit.c:5450 g10/sign.c:295
++#: g10/keyedit.c:1091 g10/keyedit.c:5363 g10/keyedit.c:5455 g10/keyedit.c:5520
++#: g10/keyedit.c:5582 g10/sign.c:295
#, c-format
msgid "signing failed: %s\n"
msgstr "簽署時失敗: %s\n"
- #: g10/keyedit.c:1167
++#: g10/keyedit.c:1178
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1207
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "金鑰 %s: 變更密語時出錯: %s\n"
- #: g10/keyedit.c:1243
++#: g10/keyedit.c:1254
msgid "moving a key signature to the correct place\n"
msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
- #: g10/keyedit.c:1358
++#: g10/keyedit.c:1369
msgid "save and quit"
msgstr "儲存並離開"
- #: g10/keyedit.c:1361
++#: g10/keyedit.c:1372
msgid "show key fingerprint"
msgstr "顯示金鑰指紋"
- #: g10/keyedit.c:1362
++#: g10/keyedit.c:1373
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "請輸入金鑰鑰柄: "
- #: g10/keyedit.c:1363
++#: g10/keyedit.c:1374
msgid "list key and user IDs"
msgstr "列出金鑰和使用者 ID"
- #: g10/keyedit.c:1365
++#: g10/keyedit.c:1376
msgid "select user ID N"
msgstr "選擇使用者 ID N"
- #: g10/keyedit.c:1366
++#: g10/keyedit.c:1377
msgid "select subkey N"
msgstr "選擇子鑰 N"
- #: g10/keyedit.c:1367
++#: g10/keyedit.c:1378
msgid "check signatures"
msgstr "檢查簽章"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1383
msgid "sign selected user IDs [* see below for related commands]"
msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
- #: g10/keyedit.c:1377
++#: g10/keyedit.c:1388
msgid "sign selected user IDs locally"
msgstr "僅在本機簽署所選的使用者 ID"
- #: g10/keyedit.c:1378
++#: g10/keyedit.c:1389
msgid "sign selected user IDs with a trust signature"
msgstr "用信任簽章來簽署所選的使用者 ID"
- #: g10/keyedit.c:1380
++#: g10/keyedit.c:1391
msgid "sign selected user IDs with a non-revocable signature"
msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
- #: g10/keyedit.c:1382
++#: g10/keyedit.c:1393
msgid "add a user ID"
msgstr "增加使用者 ID"
- #: g10/keyedit.c:1384
++#: g10/keyedit.c:1395
msgid "add a photo ID"
msgstr "增加照片 ID"
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "刪除所選的使用者 ID"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1399
msgid "add a subkey"
msgstr "增加子鑰"
- #: g10/keyedit.c:1391
++#: g10/keyedit.c:1402
msgid "add a key to a smartcard"
msgstr "將金鑰加到智慧卡"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1404
msgid "move a key to a smartcard"
msgstr "將金鑰移動到智慧卡"
- #: g10/keyedit.c:1395
++#: g10/keyedit.c:1406
msgid "move a backup key to a smartcard"
msgstr "將備份金鑰移動到智慧卡"
- #: g10/keyedit.c:1398
++#: g10/keyedit.c:1409
msgid "delete selected subkeys"
msgstr "刪除所選的子鑰"
- #: g10/keyedit.c:1400
++#: g10/keyedit.c:1411
msgid "add a revocation key"
msgstr "增加撤銷金鑰"
- #: g10/keyedit.c:1402
++#: g10/keyedit.c:1413
msgid "delete signatures from the selected user IDs"
msgstr "從所選的使用者 ID 中刪除簽章"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1415
msgid "change the expiration date for the key or selected subkeys"
msgstr "變更金鑰或所選子鑰的使用期限"
- #: g10/keyedit.c:1406
++#: g10/keyedit.c:1417
msgid "flag the selected user ID as primary"
msgstr "把所選的使用者 ID 標為主要"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1420
msgid "list preferences (expert)"
msgstr "列出偏好 (專家模式)"
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "列出偏好 (囉唆模式)"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "設定所選使用者 ID 的偏好清單"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1426
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
msgid "set a notation for the selected user IDs"
msgstr "為所選的使用者 ID 設定註記"
- #: g10/keyedit.c:1419
++#: g10/keyedit.c:1430
msgid "change the passphrase"
msgstr "更改密語"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1433
msgid "change the ownertrust"
msgstr "更改主觀信任"
- #: g10/keyedit.c:1425
++#: g10/keyedit.c:1436
msgid "revoke signatures on the selected user IDs"
msgstr "撤銷所選使用者 ID 的簽章"
- #: g10/keyedit.c:1427
++#: g10/keyedit.c:1438
msgid "revoke selected user IDs"
msgstr "撤銷所選的使用者 ID"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1441
msgid "revoke key or selected subkeys"
msgstr "撤銷金鑰或所選的子鑰"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1443
msgid "enable key"
msgstr "啟用金鑰"
- #: g10/keyedit.c:1433
++#: g10/keyedit.c:1444
msgid "disable key"
msgstr "停用金鑰"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1446
msgid "show selected photo IDs"
msgstr "顯示所選的照片 ID"
- #: g10/keyedit.c:1437
++#: g10/keyedit.c:1448
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
- #: g10/keyedit.c:1439
++#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1562
msgid "Secret key is available.\n"
msgstr "私鑰可用.\n"
- #: g10/keyedit.c:1651
++#: g10/keyedit.c:1662
msgid "Need the secret key to do this.\n"
msgstr "要有私鑰纔能這麼做.\n"
- #: g10/keyedit.c:1672
++#: g10/keyedit.c:1683
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -3902,247 -3129,191 +4027,248 @@@ msgstr "
" 加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
" (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
- #: g10/keyedit.c:1727 g10/keyedit.c:2516
++#: g10/keyedit.c:1738 g10/keyedit.c:2543
msgid "Key is revoked."
msgstr "金鑰已撤銷."
- #: g10/keyedit.c:1746
++#: g10/keyedit.c:1761
msgid "Really sign all user IDs? (y/N) "
msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:1753
++#: g10/keyedit.c:1765
+ #, fuzzy
+ #| msgid "Really sign all user IDs? (y/N) "
+ msgid "Really sign all text user IDs? (y/N) "
+ msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
+
++#: g10/keyedit.c:1773
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示: 選擇使用者 ID 來加以簽署\n"
- #: g10/keyedit.c:1763
++#: g10/keyedit.c:1784
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "未知的簽章種類 '%s'\n"
- #: g10/keyedit.c:1787
++#: g10/keyedit.c:1808
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允許使用這個指令.\n"
- #: g10/keyedit.c:1809 g10/keyedit.c:1833 g10/keyedit.c:2037
++#: g10/keyedit.c:1830 g10/keyedit.c:1854 g10/keyedit.c:2058
msgid "You must select at least one user ID.\n"
msgstr "你至少得選擇一個使用者 ID.\n"
- #: g10/keyedit.c:1811 g10/keyedit.c:1835 g10/keyedit.c:1999 g10/keyedit.c:2039
++#: g10/keyedit.c:1832 g10/keyedit.c:1856 g10/keyedit.c:2020 g10/keyedit.c:2060
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1814
++#: g10/keyedit.c:1835
msgid "You can't delete the last user ID!\n"
msgstr "你不能刪除最後一個使用者 ID!\n"
- #: g10/keyedit.c:1817
++#: g10/keyedit.c:1838
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:1818
++#: g10/keyedit.c:1839
msgid "Really remove this user ID? (y/N) "
msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1896
msgid "Really move the primary key? (y/N) "
msgstr "真的要移動主鑰嗎? (y/N) "
- #: g10/keyedit.c:1887
++#: g10/keyedit.c:1908
msgid "You must select exactly one key.\n"
msgstr "你一定祇得選擇一把金鑰.\n"
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1938
msgid "Command expects a filename argument\n"
msgstr "這項指令要拿一個檔名來當作引數\n"
- #: g10/keyedit.c:1931
++#: g10/keyedit.c:1952
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
- #: g10/keyedit.c:1947
++#: g10/keyedit.c:1968
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
- #: g10/keyedit.c:1997
++#: g10/keyedit.c:2018
msgid "You must select at least one key.\n"
msgstr "你至少得選擇一把金鑰.\n"
- #: g10/keyedit.c:2003
++#: g10/keyedit.c:2024
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
- #: g10/keyedit.c:2005
++#: g10/keyedit.c:2026
msgid "Do you really want to delete this key? (y/N) "
msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
- #: g10/keyedit.c:2043
++#: g10/keyedit.c:2064
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2044
++#: g10/keyedit.c:2065
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2083
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
- #: g10/keyedit.c:2073
++#: g10/keyedit.c:2094
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
- #: g10/keyedit.c:2075
++#: g10/keyedit.c:2096
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
- #: g10/keyedit.c:2124
++#: g10/keyedit.c:2145
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2190
msgid "Set preference list to:\n"
msgstr "設定偏好清單至:\n"
- #: g10/keyedit.c:2176
++#: g10/keyedit.c:2197
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
- #: g10/keyedit.c:2178
++#: g10/keyedit.c:2199
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新偏好設定嗎? (y/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2273
msgid "Save changes? (y/N) "
msgstr "要儲存變更嗎? (y/N) "
- #: g10/keyedit.c:2256
++#: g10/keyedit.c:2277
msgid "Quit without saving? (y/N) "
msgstr "要不儲存就離開嗎? (y/N) "
- #: g10/keyedit.c:2267 g10/keyedit.c:2277 g10/keyedit.c:2413 g10/keyedit.c:2561
++#: g10/keyedit.c:2288 g10/keyedit.c:2298 g10/keyedit.c:2440 g10/keyedit.c:2588
#, c-format
msgid "update failed: %s\n"
msgstr "更新失敗: %s\n"
- #: g10/keyedit.c:2283 g10/keyedit.c:2566
++#: g10/keyedit.c:2304 g10/keyedit.c:2593
msgid "Key not changed so no update needed.\n"
msgstr "金鑰沒有變更所以不需要更新.\n"
- #: g10/keyedit.c:2401 g10/revoke.c:614 g10/revoke.c:635
- #, c-format
- msgid "secret key \"%s\" not found: %s\n"
- msgstr "找不到私鑰 \"%s\": %s\n"
-
- #: g10/keyedit.c:2462
++#: g10/keyedit.c:2489
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" 不是指紋\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2521
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" 不是主要指紋\n"
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "No matching user IDs."
msgstr "沒有相符的使用者 ID."
- #: g10/keyedit.c:2548
++#: g10/keyedit.c:2575
msgid "Nothing to sign.\n"
msgstr "沒有東西可以簽署.\n"
- #: g10/keyedit.c:2660
++#: g10/keyedit.c:2687
msgid "Digest: "
msgstr "摘要: "
- #: g10/keyedit.c:2717
++#: g10/keyedit.c:2744
msgid "Features: "
msgstr "特點: "
- #: g10/keyedit.c:2728
++#: g10/keyedit.c:2755
msgid "Keyserver no-modify"
msgstr "金鑰伺服器無修改"
- #: g10/keyedit.c:2743 g10/keylist.c:355
++#: g10/keyedit.c:2770 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "偏好的金鑰伺服器: "
- #: g10/keyedit.c:2751 g10/keyedit.c:2752
++#: g10/keyedit.c:2778 g10/keyedit.c:2779
msgid "Notations: "
msgstr "註記: "
- #: g10/keyedit.c:2987
++#: g10/keyedit.c:3024
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
- #: g10/keyedit.c:3058
++#: g10/keyedit.c:3096
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
- #: g10/keyedit.c:3082
++#: g10/keyedit.c:3120
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
- #: g10/keyedit.c:3088
++#: g10/keyedit.c:3126
msgid "(sensitive)"
msgstr "(機密)"
- #: g10/keyedit.c:3130 g10/keyedit.c:3271 g10/keylist.c:240 g10/keyserver.c:539
++#: g10/keyedit.c:3168 g10/keyedit.c:3309 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "建立: %s"
- #: g10/keyedit.c:3133 g10/keylist.c:1049 g10/keylist.c:1181
- #: g10/mainproc.c:1013
++#: g10/keyedit.c:3171 g10/keylist.c:1071 g10/keylist.c:1203
++#: g10/mainproc.c:1030
#, c-format
msgid "revoked: %s"
msgstr "撤銷: %s"
# of subkey
- #: g10/keyedit.c:3135 g10/keylist.c:1055 g10/keylist.c:1187
++#: g10/keyedit.c:3173 g10/keylist.c:1077 g10/keylist.c:1209
#, c-format
msgid "expired: %s"
msgstr "過期: %s"
# of subkey
- #: g10/keyedit.c:3137 g10/keyedit.c:3273 g10/keylist.c:242 g10/keylist.c:1061
- #: g10/keylist.c:1193 g10/keyserver.c:545 g10/mainproc.c:1019
++#: g10/keyedit.c:3175 g10/keyedit.c:3311 g10/keylist.c:264 g10/keylist.c:1083
++#: g10/keylist.c:1215 g10/keyserver.c:542 g10/mainproc.c:1036
#, c-format
msgid "expires: %s"
msgstr "到期: %s"
- #: g10/keyedit.c:3139
++#: g10/keyedit.c:3177
#, c-format
msgid "usage: %s"
msgstr "用途: %s"
- #: g10/keyedit.c:3147 g10/keyedit.c:3167 g10/keylist.c:245
++#: g10/keyedit.c:3185 g10/keyedit.c:3205 g10/keylist.c:267
msgid "card-no: "
msgstr "卡片編號: "
- #: g10/keyedit.c:3205
++#: g10/keyedit.c:3243
#, c-format
msgid "trust: %s"
msgstr "信任: %s"
- #: g10/keyedit.c:3209
++#: g10/keyedit.c:3247
#, c-format
msgid "validity: %s"
msgstr "有效性: %s"
- #: g10/keyedit.c:3216
++#: g10/keyedit.c:3254
msgid "This key has been disabled"
msgstr "這把金鑰已經停用了"
- #: g10/keyedit.c:3234
++#: g10/keyedit.c:3272
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4150,17 -3321,12 +4276,17 @@@ msgstr "
"請注意顯示出來的金鑰有效性不需要更正,\n"
"除非你重新執行程式.\n"
- #: g10/keyedit.c:3290 g10/keyedit.c:3718 g10/keyserver.c:549
- #: g10/mainproc.c:1938 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3328 g10/keyedit.c:3756 g10/keyserver.c:546
++#: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "已撤銷"
- #: g10/keyedit.c:3292 g10/keyedit.c:3720 g10/keyserver.c:553
- #: g10/mainproc.c:1940 g10/trust.c:105 g10/trust.c:686
++#: g10/keyedit.c:3330 g10/keyedit.c:3758 g10/keyserver.c:550
++#: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
msgid "expired"
msgstr "已過期"
- #: g10/keyedit.c:3409
++#: g10/keyedit.c:3447
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"
@@@ -4168,15 -3334,12 +4294,15 @@@ msgstr "
"警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
" 導致不同的使用者 ID 被當成主要 ID.\n"
- #: g10/keyedit.c:3461
++#: g10/keyedit.c:3499
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "警告: 你的加密子鑰很快將到期.\n"
- #: g10/keyedit.c:3462
++#: g10/keyedit.c:3500
msgid "You may want to change its expiration date too.\n"
msgstr "你可能也會想變更其使用期限.\n"
- #: g10/keyedit.c:3521
++#: g10/keyedit.c:3559
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4185,78 -3348,61 +4311,78 @@@ msgstr "
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:3526 g10/keyedit.c:3815
++#: g10/keyedit.c:3564 g10/keyedit.c:3853
msgid "Are you sure you still want to add it? (y/N) "
msgstr "你確定仍然想要增加嗎? (y/N) "
- #: g10/keyedit.c:3532
++#: g10/keyedit.c:3570
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
- #: g10/keyedit.c:3545 g10/keygen.c:2618
++#: g10/keyedit.c:3583 g10/keygen.c:2622
msgid "Such a user ID already exists on this key!\n"
msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
- #: g10/keyedit.c:3646
++#: g10/keyedit.c:3684
msgid "Delete this good signature? (y/N/q)"
msgstr "刪除這份完好的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:3656
++#: g10/keyedit.c:3694
msgid "Delete this invalid signature? (y/N/q)"
msgstr "刪除這份無效的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:3660
++#: g10/keyedit.c:3698
msgid "Delete this unknown signature? (y/N/q)"
msgstr "刪除這份未知的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:3667
++#: g10/keyedit.c:3705
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要刪除這份自我簽章嗎? (y/N)"
- #: g10/keyedit.c:3683
++#: g10/keyedit.c:3721
#, c-format
msgid "Deleted %d signature.\n"
msgstr "已經刪除了 %d 份簽章.\n"
- #: g10/keyedit.c:3684
++#: g10/keyedit.c:3722
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "已經刪除了 %d 份簽章.\n"
- #: g10/keyedit.c:3687
++#: g10/keyedit.c:3725
msgid "Nothing deleted.\n"
msgstr "沒有刪除任何東西.\n"
- #: g10/keyedit.c:3722 g10/trust.c:688
++#: g10/keyedit.c:3760 g10/trust.c:689
msgid "invalid"
msgstr "無效"
- #: g10/keyedit.c:3724
++#: g10/keyedit.c:3762
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "使用者 ID \"%s\" 已精簡: %s\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:3769
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
- #: g10/keyedit.c:3732
++#: g10/keyedit.c:3770
#, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3778
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "使用者 ID \"%s\": 已經最小化了\n"
- #: g10/keyedit.c:3741
++#: g10/keyedit.c:3779
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
- #: g10/keyedit.c:3810
++#: g10/keyedit.c:3848
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4265,186 -3411,155 +4391,197 @@@ msgstr "
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:3821
++#: g10/keyedit.c:3859
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
- #: g10/keyedit.c:3838
++#: g10/keyedit.c:3876
msgid "Enter the user ID of the designated revoker: "
msgstr "輸入指定撤銷者的使用者 ID: "
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:3901
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
- #: g10/keyedit.c:3878
++#: g10/keyedit.c:3916
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
- #: g10/keyedit.c:3900
++#: g10/keyedit.c:3938
msgid "this key has already been designated as a revoker\n"
msgstr "已指定這把金鑰為撤銷者了\n"
- #: g10/keyedit.c:3919
++#: g10/keyedit.c:3957
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
- #: g10/keyedit.c:3925
++#: g10/keyedit.c:3963
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
- #: g10/keyedit.c:3974
- msgid "Please select at most one subkey.\n"
- msgstr "請至多選擇一把子鑰.\n"
++#: g10/keyedit.c:4014
+ #, fuzzy
+ #| msgid ""
+ #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+ msgid ""
+ "Are you sure you want to change the expiration time for multiple subkeys? (y/"
+ "N) "
+ msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
- #: g10/keyedit.c:3978
++#: g10/keyedit.c:4019
msgid "Changing expiration time for a subkey.\n"
msgstr "正在變更子鑰的使用期限.\n"
- #: g10/keyedit.c:3981
++#: g10/keyedit.c:4022
msgid "Changing expiration time for the primary key.\n"
msgstr "正在變更主鑰的使用期限.\n"
- #: g10/keyedit.c:4028
++#: g10/keyedit.c:4073
msgid "You can't change the expiration date of a v3 key\n"
msgstr "你不能變更 v3 金鑰的使用期限\n"
- #: g10/keyedit.c:4095
++#: g10/keyedit.c:4140
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "簽署子鑰 %s 已經交叉認證過了\n"
- #: g10/keyedit.c:4101
++#: g10/keyedit.c:4146
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
- #: g10/keyedit.c:4216
++#: g10/keyedit.c:4261
msgid "Please select exactly one user ID.\n"
msgstr "請祇選擇一個使用者 ID.\n"
- #: g10/keyedit.c:4257 g10/keyedit.c:4371 g10/keyedit.c:4484 g10/keyedit.c:4621
++#: g10/keyedit.c:4302 g10/keyedit.c:4416 g10/keyedit.c:4529 g10/keyedit.c:4666
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4473
msgid "Enter your preferred keyserver URL: "
msgstr "請輸入你的偏好金鑰伺服器 URL: "
- #: g10/keyedit.c:4507
++#: g10/keyedit.c:4552
msgid "Are you sure you want to replace it? (y/N) "
msgstr "你確定要取代它嗎？ (y/N) "
- #: g10/keyedit.c:4508
++#: g10/keyedit.c:4553
msgid "Are you sure you want to delete it? (y/N) "
msgstr "你確定要刪除它嗎？ (y/N) "
- #: g10/keyedit.c:4567
++#: g10/keyedit.c:4612
msgid "Enter the notation: "
msgstr "請輸入註記: "
- #: g10/keyedit.c:4714
++#: g10/keyedit.c:4759
msgid "Proceed? (y/N) "
msgstr "是否繼續? (y/N) "
- #: g10/keyedit.c:4784
++#: g10/keyedit.c:4829
#, c-format
msgid "No user ID with index %d\n"
msgstr "索引 %d 沒有對應到使用者 ID\n"
- #: g10/keyedit.c:4846
++#: g10/keyedit.c:4891
#, c-format
msgid "No user ID with hash %s\n"
msgstr "雜湊 %s 沒有對應到使用者 ID\n"
- #: g10/keyedit.c:4882
++#: g10/keyedit.c:4992
+ #, fuzzy, c-format
+ #| msgid "No subkey with index %d\n"
+ msgid "No subkey with key ID '%s'.\n"
+ msgstr "索引 %d 沒有對應到子鑰\n"
+
++#: g10/keyedit.c:5014
#, c-format
msgid "No subkey with index %d\n"
msgstr "索引 %d 沒有對應到子鑰\n"
- #: g10/keyedit.c:5023
++#: g10/keyedit.c:5155
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "使用者 ID: \"%s\"\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5128 g10/keyedit.c:5176
++#: g10/keyedit.c:5158 g10/keyedit.c:5260 g10/keyedit.c:5308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
- #: g10/keyedit.c:5028 g10/keyedit.c:5130 g10/keyedit.c:5178
++#: g10/keyedit.c:5160 g10/keyedit.c:5262 g10/keyedit.c:5310
msgid " (non-exportable)"
msgstr " (不可匯出)"
- #: g10/keyedit.c:5032
++#: g10/keyedit.c:5164
#, c-format
msgid "This signature expired on %s.\n"
msgstr "這份簽章已經在 %s 過期了.\n"
- #: g10/keyedit.c:5037
++#: g10/keyedit.c:5169
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "你確定仍然想要撤銷它嗎? (y/N) "
- #: g10/keyedit.c:5042
++#: g10/keyedit.c:5174
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
- #: g10/keyedit.c:5096
++#: g10/keyedit.c:5228
msgid "Not signed by you.\n"
msgstr "並非由你所簽署.\n"
- #: g10/keyedit.c:5102
++#: g10/keyedit.c:5234
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
- #: g10/keyedit.c:5131
++#: g10/keyedit.c:5263
msgid " (non-revocable)"
msgstr " (不可撤銷)"
- #: g10/keyedit.c:5138
++#: g10/keyedit.c:5270
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
- #: g10/keyedit.c:5163
++#: g10/keyedit.c:5295
msgid "You are about to revoke these signatures:\n"
msgstr "你正要撤銷這些簽章:\n"
- #: g10/keyedit.c:5186
++#: g10/keyedit.c:5318
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要建立撤銷憑證嗎? (y/N) "
- #: g10/keyedit.c:5219
++#: g10/keyedit.c:5351
msgid "no secret key\n"
msgstr "沒有私鑰\n"
- #: g10/keyedit.c:5288
++#: g10/keyedit.c:5420
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "使用者 ID \"%s\" 已撤銷\n"
- #: g10/keyedit.c:5305
++#: g10/keyedit.c:5437
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
- #: g10/keyedit.c:5373
++#: g10/keyedit.c:5505
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "金鑰 %s 已撤銷.\n"
- #: g10/keyedit.c:5435
++#: g10/keyedit.c:5567
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子鑰 %s 已撤銷.\n"
- #: g10/keyedit.c:5532
++#: g10/keyedit.c:5664
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@@ -4483,14 -3590,10 +4620,14 @@@ msgstr "寫入自我簽章中\n
msgid "writing key binding signature\n"
msgstr "寫入附鑰簽章中\n"
+#: g10/keygen.c:1370 g10/keygen.c:1375 g10/keygen.c:1425 g10/keygen.c:1430
- #: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3875
++#: g10/keygen.c:1573 g10/keygen.c:1578 g10/keygen.c:3882
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "金鑰尺寸無效; 改用 %u 位元\n"
+#: g10/keygen.c:1381 g10/keygen.c:1436 g10/keygen.c:1444 g10/keygen.c:1584
- #: g10/keygen.c:3881
++#: g10/keygen.c:3888
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "金鑰尺寸增大到 %u 位元\n"
@@@ -4777,40 -3831,35 +4914,45 @@@ msgstr "
msgid "Real name: "
msgstr "真實姓名: "
- #: g10/keygen.c:2539
++#: g10/keygen.c:2540
msgid "Invalid character in name\n"
msgstr "姓名含有無效的字符\n"
+#: g10/keygen.c:2541
+ #, c-format
+ msgid "The characters '%s' and '%s' may not appear in name\n"
+ msgstr ""
+
++#: g10/keygen.c:2545
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用數字開頭\n"
- #: g10/keygen.c:2543
++#: g10/keygen.c:2547
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五個字符長\n"
- #: g10/keygen.c:2551
++#: g10/keygen.c:2555
msgid "Email address: "
msgstr "電子郵件地址: "
- #: g10/keygen.c:2557
++#: g10/keygen.c:2561
msgid "Not a valid email address\n"
msgstr "不是有效的電子郵件地址\n"
- #: g10/keygen.c:2566
++#: g10/keygen.c:2570
msgid "Comment: "
msgstr "註釋: "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2576
msgid "Invalid character in comment\n"
msgstr "註釋含有無效的字符\n"
- #: g10/keygen.c:2599
++#: g10/keygen.c:2603
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "你正在使用 '%s' 字元集.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2609
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4821,7 -3870,6 +4963,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2610
++#: g10/keygen.c:2614
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
@@@ -4836,31 -3884,24 +4978,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2635
++#: g10/keygen.c:2639
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2645
++#: g10/keygen.c:2649
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
- #: g10/keygen.c:2646
++#: g10/keygen.c:2650
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
- #: g10/keygen.c:2651
++#: g10/keygen.c:2655
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2656
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
- #: g10/keygen.c:2671
++#: g10/keygen.c:2675
msgid "Please correct the error first\n"
msgstr "請先訂正錯誤\n"
- #: g10/keygen.c:2714
++#: g10/keygen.c:2718
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@@ -4868,22 -3909,18 +5010,22 @@@ msgstr "
"你需要一個密語來保護你的私鑰.\n"
"\n"
- #: g10/keygen.c:2717
++#: g10/keygen.c:2721
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "請輸入密語以保護新加密金鑰的卡片外備份."
- #: g10/keygen.c:2732
++#: g10/keygen.c:2736
msgid "passphrase not correctly repeated; try again"
msgstr "前後兩次輸入的密語不一致; 請再試一次"
- #: g10/keygen.c:2733
++#: g10/keygen.c:2737
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
- #: g10/keygen.c:2739
++#: g10/keygen.c:2743
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@@ -4895,7 -3932,6 +5037,7 @@@ msgstr "
"僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
"\n"
- #: g10/keygen.c:2766
++#: g10/keygen.c:2770
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"
@@@ -4906,12 -3942,10 +5048,12 @@@ msgstr "
"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
- #: g10/keygen.c:3507 g10/keygen.c:4217 g10/keygen.c:4345 g10/keygen.c:4442
++#: g10/keygen.c:3511 g10/keygen.c:4230 g10/keygen.c:4358 g10/keygen.c:4455
#, c-format
msgid "Key generation failed: %s\n"
msgstr "產生金鑰失敗: %s\n"
- #: g10/keygen.c:3516
++#: g10/keygen.c:3520
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -4922,52 -3956,41 +5064,52 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3518
++#: g10/keygen.c:3522
msgid "Continue? (Y/n) "
msgstr "是否繼續? (Y/n) "
- #: g10/keygen.c:3536
++#: g10/keygen.c:3543
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" 的金鑰已存在\n"
- #: g10/keygen.c:3541
++#: g10/keygen.c:3548
msgid "Create anyway? (y/N) "
msgstr "無論如何還是要建立嗎? (y/N) "
- #: g10/keygen.c:3546
++#: g10/keygen.c:3553
msgid "creating anyway\n"
msgstr "總之還是在建立\n"
- #: g10/keygen.c:3807
++#: g10/keygen.c:3814
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "請注意: 如需全能金鑰產生對話框請用 \"%s %s\".\n"
- #: g10/keygen.c:3834
++#: g10/keygen.c:3841
msgid "Key generation canceled.\n"
msgstr "金鑰產生已取消.\n"
- #: g10/keygen.c:4014 g10/keygen.c:4156
++#: g10/keygen.c:4021 g10/keygen.c:4169
#, c-format
msgid "writing public key to '%s'\n"
msgstr "正在寫入公鑰至 '%s'\n"
- #: g10/keygen.c:4151
++#: g10/keygen.c:4163
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
- #: g10/keygen.c:4164
++#: g10/keygen.c:4177
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/keygen.c:4193
++#: g10/keygen.c:4206
msgid "public and secret key created and signed.\n"
msgstr "公鑰和私鑰已建立及簽署.\n"
- #: g10/keygen.c:4204
++#: g10/keygen.c:4217
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"
@@@ -4975,251 -3998,197 +5117,251 @@@ msgstr "
"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
"來產生加密用的子鑰.\n"
- #: g10/keygen.c:4267 g10/keygen.c:4390 g10/sign.c:238
++#: g10/keygen.c:4280 g10/keygen.c:4403 g10/sign.c:238
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4269 g10/keygen.c:4392 g10/sign.c:240
++#: g10/keygen.c:4282 g10/keygen.c:4405 g10/sign.c:240
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4280 g10/keygen.c:4403
++#: g10/keygen.c:4293 g10/keygen.c:4416
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
- #: g10/keygen.c:4291
++#: g10/keygen.c:4304
msgid "Secret parts of primary key are not available.\n"
msgstr "主鑰的私鑰部分無法取用.\n"
- #: g10/keygen.c:4295
++#: g10/keygen.c:4308
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鑰的私鑰部分存放於卡上.\n"
- #: g10/keygen.c:4313 g10/keygen.c:4418
++#: g10/keygen.c:4326 g10/keygen.c:4431
msgid "Really create? (y/N) "
msgstr "真的要建立嗎? (y/N) "
- #: g10/keygen.c:4609
++#: g10/keygen.c:4622
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "儲存金鑰到卡片上時失敗: %s\n"
- #: g10/keygen.c:4661
++#: g10/keygen.c:4674
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "無法建立備份檔案 '%s': %s\n"
- #: g10/keygen.c:4687
++#: g10/keygen.c:4700
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
- #: g10/keyid.c:575 g10/keyid.c:588 g10/keyid.c:601
++#: g10/keyid.c:591 g10/keyid.c:604 g10/keyid.c:617
msgid "never "
msgstr "永遠不過期"
- #: g10/keylist.c:309
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "關鍵簽章原則: "
- #: g10/keylist.c:311
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "簽章原則: "
- #: g10/keylist.c:353
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "執意偏好的金鑰伺服器: "
- #: g10/keylist.c:406
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "關鍵簽章註記: "
- #: g10/keylist.c:408
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "簽章註記: "
- #: g10/keylist.c:446
++#: g10/keylist.c:468
#, fuzzy
#| msgid "1 bad signature\n"
msgid "1 good signature\n"
msgstr "1 份損壞的簽章\n"
- #: g10/keylist.c:448
++#: g10/keylist.c:470
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signatures\n"
msgstr "%d 份損壞的簽章\n"
- #: g10/keylist.c:543
++#: g10/keylist.c:565
#, c-format
msgid "Warning: %lu key(s) skipped due to their large size\n"
msgstr "警告: %lu 把金鑰因尺寸太大已跳過\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:585
msgid "Keyring"
msgstr "鑰匙圈"
- #: g10/keylist.c:911 g10/keyserver.c:1804 g10/skclist.c:189 g10/skclist.c:217
++#: g10/keylist.c:933 g10/keyserver.c:1808 g10/skclist.c:190 g10/skclist.c:218
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "已跳過 \"%s\": %s\n"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1888
msgid "Primary key fingerprint:"
msgstr " 主鑰指紋:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1890
msgid " Subkey fingerprint:"
msgstr " 子鑰指紋:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1898
msgid " Primary key fingerprint:"
msgstr " 主鑰指紋:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1900 g10/keylist.c:1910
msgid " Subkey fingerprint:"
msgstr " 子鑰指紋:"
# use tty
- #: g10/keylist.c:1871 g10/keylist.c:1881
++#: g10/keylist.c:1905 g10/keylist.c:1915
msgid " Key fingerprint ="
msgstr " 金鑰指紋 ="
- #: g10/keylist.c:1939
++#: g10/keylist.c:1959
msgid " Card serial no. ="
msgstr " 卡片序號 ="
- #: g10/keyring.c:1307
++#: g10/keyring.c:1402
#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
- #: g10/keyring.c:1435
++#: g10/keyring.c:1532
#, c-format
msgid "caching keyring '%s'\n"
msgstr "快取鑰匙圈 '%s' 中\n"
- #: g10/keyring.c:1512
++#: g10/keyring.c:1609
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
- #: g10/keyring.c:1524
++#: g10/keyring.c:1621
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
- #: g10/keyring.c:1596
++#: g10/keyring.c:1693
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: 鑰匙圈已建立\n"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:93
msgid "include revoked keys in search results"
msgstr "在搜尋結果中也包含已撤銷的金鑰"
- #: g10/keyserver.c:97
++#: g10/keyserver.c:94
msgid "include subkeys when searching by key ID"
msgstr "以金鑰 ID 搜尋時也搜尋子鑰"
- #: g10/keyserver.c:99
++#: g10/keyserver.c:96
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:103
++#: g10/keyserver.c:100
msgid "automatically retrieve keys when verifying signatures"
msgstr "驗證簽章時自動取回金鑰"
- #: g10/keyserver.c:105
++#: g10/keyserver.c:102
msgid "honor the preferred keyserver URL set on the key"
msgstr "尊重金鑰上所設定的偏好金鑰伺服器 URL"
- #: g10/keyserver.c:107
++#: g10/keyserver.c:104
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
- #: g10/keyserver.c:551
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "已停用"
- #: g10/keyserver.c:755
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
- #: g10/keyserver.c:861
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
- #: g10/keyserver.c:1002 g10/keyserver.c:1117
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
- #: g10/keyserver.c:1403 g10/keyserver.c:1437
++#: g10/keyserver.c:1406 g10/keyserver.c:1440
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "更新 1 份金鑰中 (從 %s )\n"
- #: g10/keyserver.c:1410
++#: g10/keyserver.c:1413
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
- #: g10/keyserver.c:1439
++#: g10/keyserver.c:1442
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "更新 %d 份金鑰中 (從 %s )\n"
- #: g10/keyserver.c:1515
++#: g10/keyserver.c:1518
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
- #: g10/keyserver.c:1518
++#: g10/keyserver.c:1521
msgid "key not found on keyserver\n"
msgstr "在金鑰伺服器上找不到金鑰\n"
- #: g10/keyserver.c:1522 g10/keyserver.c:1790 g10/keyserver.c:1948
++#: g10/keyserver.c:1525 g10/keyserver.c:1793 g10/keyserver.c:1952
msgid "no keyserver known (use option --keyserver)\n"
msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
- #: g10/keyserver.c:1686
++#: g10/keyserver.c:1689
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
- #: g10/keyserver.c:1690
++#: g10/keyserver.c:1693
#, c-format
msgid "requesting key %s from %s\n"
msgstr "正在請求金鑰 %s 自 %s\n"
- #: g10/keyserver.c:1808
++#: g10/keyserver.c:1812
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
- #: g10/keyserver.c:1812
++#: g10/keyserver.c:1816
#, c-format
msgid "sending key %s to %s\n"
msgstr "遞送金鑰 %s 至 %s\n"
- #: g10/keyserver.c:1852
++#: g10/keyserver.c:1856
#, c-format
msgid "requesting key from '%s'\n"
msgstr "正在向 '%s' 請求金鑰\n"
- #: g10/keyserver.c:1868
++#: g10/keyserver.c:1872
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告: 無法抓取 URI %s: %s\n"
@@@ -5253,7 -4216,6 +5395,7 @@@ msgstr "公鑰加密過的資料: 完�
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "已用 %u 位元長的 %s 金鑰, ID %s, 建立於 %s 所加密\n"
- #: g10/mainproc.c:496 g10/pkclist.c:230
++#: g10/mainproc.c:496 g10/pkclist.c:231
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
@@@ -5299,246 -4252,195 +5441,247 @@@ msgstr "解密成功\n
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告: 加密過的訊息已經被變造了!\n"
- #: g10/mainproc.c:649
- #, c-format
- msgid "cleared passphrase cached with ID: %s\n"
- msgstr "清除此 ID 被快取住的密語: %s\n"
-
- #: g10/mainproc.c:655
++#: g10/mainproc.c:656
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失敗: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:679
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:681
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始的檔名 ='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:751
msgid "WARNING: multiple plaintexts seen\n"
msgstr "警告: 看到了多份明文\n"
- #: g10/mainproc.c:915
++#: g10/mainproc.c:917
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
- #: g10/mainproc.c:1215 g10/mainproc.c:1258
++#: g10/mainproc.c:1232 g10/mainproc.c:1275
msgid "no signature found\n"
msgstr "找不到簽章\n"
- #: g10/mainproc.c:1561
++#: g10/mainproc.c:1578
#, c-format
msgid "BAD signature from \"%s\""
msgstr "*損壞* 的簽章來自於 \"%s\""
- #: g10/mainproc.c:1563
++#: g10/mainproc.c:1580
#, c-format
msgid "Expired signature from \"%s\""
msgstr "過期的簽章來自於 \"%s\""
- #: g10/mainproc.c:1565
++#: g10/mainproc.c:1582
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的簽章來自於 \"%s\""
- #: g10/mainproc.c:1585
++#: g10/mainproc.c:1602
msgid "signature verification suppressed\n"
msgstr "簽章驗證已抑制\n"
- #: g10/mainproc.c:1694
++#: g10/mainproc.c:1711
msgid "can't handle this ambiguous signature data\n"
msgstr "無法處理這個不明確的簽章資料\n"
- #: g10/mainproc.c:1704
++#: g10/mainproc.c:1721
#, c-format
msgid "Signature made %s\n"
msgstr "由 %s 建立的簽章\n"
- #: g10/mainproc.c:1705
++#: g10/mainproc.c:1722
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 金鑰 %s\n"
- #: g10/mainproc.c:1709
++#: g10/mainproc.c:1726
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
- #: g10/mainproc.c:1729
++#: g10/mainproc.c:1746
msgid "Key available at: "
msgstr "可用的金鑰於: "
- #: g10/mainproc.c:1894
++#: g10/mainproc.c:1924
msgid "[uncertain]"
msgstr "[ 不確定 ]"
- #: g10/mainproc.c:1930
++#: g10/mainproc.c:1961
#, c-format
msgid " aka \"%s\""
msgstr " 亦即 \"%s\""
- #: g10/mainproc.c:2032
++#: g10/mainproc.c:2071
#, c-format
msgid "Signature expired %s\n"
msgstr "這份簽署已經在 %s 過期了\n"
- #: g10/mainproc.c:2036
++#: g10/mainproc.c:2075
#, c-format
msgid "Signature expires %s\n"
msgstr "這份簽署將在 %s 到期\n"
- #: g10/mainproc.c:2039
++#: g10/mainproc.c:2078
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
- #: g10/mainproc.c:2040
++#: g10/mainproc.c:2079
msgid "binary"
msgstr "二進制"
- #: g10/mainproc.c:2041
++#: g10/mainproc.c:2080
msgid "textmode"
msgstr "文字模式"
- #: g10/mainproc.c:2041 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2043
++#: g10/mainproc.c:2082
msgid ", key algorithm "
msgstr ", 金鑰演算法 "
- #: g10/mainproc.c:2077
++#: g10/mainproc.c:2117
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2104
++#: g10/mainproc.c:2144
#, c-format
msgid "Can't check signature: %s\n"
msgstr "無法檢查簽章: %s\n"
- #: g10/mainproc.c:2197 g10/mainproc.c:2216 g10/mainproc.c:2322
++#: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
msgid "not a detached signature\n"
msgstr "不是一份分離的簽章\n"
- #: g10/mainproc.c:2245
++#: g10/mainproc.c:2285
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
- #: g10/mainproc.c:2254
++#: g10/mainproc.c:2294
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等級 0x%02x 的獨立簽章\n"
- #: g10/mainproc.c:2326
++#: g10/mainproc.c:2366
msgid "old style (PGP 2.x) signature\n"
msgstr "舊型 (PGP 2.x) 簽章\n"
- #: g10/misc.c:102 g10/misc.c:132 g10/misc.c:208
++#: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "'%s' 的 fstat 失敗於 %s: %s\n"
- #: g10/misc.c:171
++#: g10/misc.c:172
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) 失敗於 %s: %s\n"
- #: g10/misc.c:280
++#: g10/misc.c:281
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "警告: 正在使用實驗性的 %s 公鑰演算法\n"
- #: g10/misc.c:287
++#: g10/misc.c:288
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "警告: 已不建議使用 Elgamal 簽署暨加密金鑰\n"
- #: g10/misc.c:301
++#: g10/misc.c:302
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
- #: g10/misc.c:317
++#: g10/misc.c:321
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
- #: g10/misc.c:324
++#: g10/misc.c:330
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "警告: 已不建議使用 %s 摘要演算法\n"
- #: g10/misc.c:339
++#: g10/misc.c:355
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
- #: g10/misc.c:997
++#: g10/misc.c:1012
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
- #: g10/misc.c:1001
++#: g10/misc.c:1016
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告: 已不建議使用 \"%s\" 選項\n"
- #: g10/misc.c:1003
++#: g10/misc.c:1018
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "請改以 \"%s%s\" 代替\n"
- #: g10/misc.c:1010
++#: g10/misc.c:1025
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
- #: g10/misc.c:1020
++#: g10/misc.c:1035
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: 此檔案內的 \"%s\" 已廢棄 - 僅對 %s 有影響\n"
- #: g10/misc.c:1024
++#: g10/misc.c:1039
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "警告: \"%s%s\" 是已廢棄的選項 - 除了對 %s 之外沒有效果\n"
- #: g10/misc.c:1088
++#: g10/misc.c:1103
msgid "Uncompressed"
msgstr "未壓縮"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1113
++#: g10/misc.c:1128
msgid "uncompressed|none"
msgstr "uncompressed|none|未壓縮|無"
- #: g10/misc.c:1233
++#: g10/misc.c:1248
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "這個訊息對 %s 來說無法使用\n"
- #: g10/misc.c:1408
++#: g10/misc.c:1423
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "不明確的選項 '%s'\n"
- #: g10/misc.c:1433
++#: g10/misc.c:1448
#, c-format
msgid "unknown option '%s'\n"
msgstr "未知的選項 '%s'\n"
- #: g10/misc.c:1671
++#: g10/misc.c:1686
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
++#: g10/misc.c:1708
+ #, fuzzy, c-format
+ #| msgid "Unknown signature type '%s'\n"
+ msgid "unknown weak digest '%s'\n"
+ msgstr "未知的簽章種類 '%s'\n"
+
+#: g10/openfile.c:85
#, c-format
msgid "File '%s' exists. "
msgstr "檔案 '%s' 已存在. "
@@@ -5724,31 -4593,24 +5867,31 @@@ msgstr "這張照片正確嗎? (y/N/q)
msgid "unable to display photo ID!\n"
msgstr "無法顯示照片 ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:691
++#: g10/pkclist.c:73 g10/revoke.c:751
msgid "No reason specified"
msgstr "未指定原因"
- #: g10/pkclist.c:74 g10/revoke.c:693
++#: g10/pkclist.c:75 g10/revoke.c:753
msgid "Key is superseded"
msgstr "金鑰被代換了"
- #: g10/pkclist.c:76 g10/revoke.c:692
++#: g10/pkclist.c:77 g10/revoke.c:752
msgid "Key has been compromised"
msgstr "金鑰已經被洩漏了"
- #: g10/pkclist.c:78 g10/revoke.c:694
++#: g10/pkclist.c:79 g10/revoke.c:754
msgid "Key is no longer used"
msgstr "金鑰不再被使用了"
- #: g10/pkclist.c:80 g10/revoke.c:695
++#: g10/pkclist.c:81 g10/revoke.c:755
msgid "User ID is no longer valid"
msgstr "使用者 ID 不再有效了"
- #: g10/pkclist.c:84
++#: g10/pkclist.c:85
msgid "reason for revocation: "
msgstr "撤銷原因: "
- #: g10/pkclist.c:100
++#: g10/pkclist.c:101
msgid "revocation comment: "
msgstr "撤銷註釋: "
@@@ -5763,52 -4625,41 +5906,52 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:217
++#: g10/pkclist.c:218
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:225
++#: g10/pkclist.c:226
msgid "No trust value assigned to:\n"
msgstr "下列項目沒有對應的信任值:\n"
- #: g10/pkclist.c:258
++#: g10/pkclist.c:259
#, c-format
msgid " aka \"%s\"\n"
msgstr " 亦即 \"%s\"\n"
- #: g10/pkclist.c:268
++#: g10/pkclist.c:269
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "你有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
- #: g10/pkclist.c:283
++#: g10/pkclist.c:284
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = 我不知道或不想說\n"
- #: g10/pkclist.c:285
++#: g10/pkclist.c:286
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = 我*不*信任\n"
- #: g10/pkclist.c:291
++#: g10/pkclist.c:292
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = 我徹底信任\n"
- #: g10/pkclist.c:297
++#: g10/pkclist.c:298
msgid " m = back to the main menu\n"
msgstr " m = 回到主選單\n"
- #: g10/pkclist.c:300
++#: g10/pkclist.c:301
msgid " s = skip this key\n"
msgstr " s = 跳過這把金鑰\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:302
msgid " q = quit\n"
msgstr " q = 離開\n"
- #: g10/pkclist.c:305
++#: g10/pkclist.c:306
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -5817,37 -4668,29 +5960,37 @@@ msgstr "
"這把金鑰的最小信任等級為: %s\n"
"\n"
- #: g10/pkclist.c:311 g10/revoke.c:720
++#: g10/pkclist.c:312 g10/revoke.c:780
msgid "Your decision? "
msgstr "你的決定是甚麼? "
- #: g10/pkclist.c:332
++#: g10/pkclist.c:333
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "請問你是否真的想把這把金鑰設成徹底信任呢? (y/N) "
- #: g10/pkclist.c:346
++#: g10/pkclist.c:347
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "被徹底信任金鑰的憑證:\n"
- #: g10/pkclist.c:435
++#: g10/pkclist.c:436
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
- #: g10/pkclist.c:440
++#: g10/pkclist.c:441
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
- #: g10/pkclist.c:446
++#: g10/pkclist.c:447
msgid "This key probably belongs to the named user\n"
msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
- #: g10/pkclist.c:451
++#: g10/pkclist.c:452
msgid "This key belongs to us\n"
msgstr "這把金鑰是屬於我們自己的\n"
- #: g10/pkclist.c:477
++#: g10/pkclist.c:478
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"
@@@ -5857,110 -4700,85 +6000,110 @@@ msgstr "
"除非你 **真的** 知道自己在做甚麼,\n"
"否則你最好在下一個問題回答 no\n"
- #: g10/pkclist.c:496
++#: g10/pkclist.c:497
msgid "Use this key anyway? (y/N) "
msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
- #: g10/pkclist.c:530
++#: g10/pkclist.c:531
msgid "WARNING: Using untrusted key!\n"
msgstr "警告: 正在使用不被信任的金鑰!\n"
- #: g10/pkclist.c:537
++#: g10/pkclist.c:538
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
- #: g10/pkclist.c:546
++#: g10/pkclist.c:547
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
- #: g10/pkclist.c:549
++#: g10/pkclist.c:550
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:551
msgid " This could mean that the signature is forged.\n"
msgstr " 這很有可能表示此簽章是偽造的.\n"
- #: g10/pkclist.c:556
++#: g10/pkclist.c:557
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:562
msgid "Note: This key has been disabled.\n"
msgstr "請注意: 這把金鑰已停用.\n"
- #: g10/pkclist.c:581
++#: g10/pkclist.c:582
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "請注意: 已驗證的簽署者地址為 '%s'\n"
- #: g10/pkclist.c:588
++#: g10/pkclist.c:589
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "請注意: 簽署者地址 '%s' 與 DNS 項目並不吻合\n"
- #: g10/pkclist.c:600
++#: g10/pkclist.c:601
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n"
- #: g10/pkclist.c:608
++#: g10/pkclist.c:609
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "信任等級因不良的 PKA 資訊而調整為 *永遠不會*\n"
- #: g10/pkclist.c:619
++#: g10/pkclist.c:620
msgid "Note: This key has expired!\n"
msgstr "請注意: 這把金鑰已經過期了!\n"
- #: g10/pkclist.c:630
++#: g10/pkclist.c:631
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
- #: g10/pkclist.c:632
++#: g10/pkclist.c:633
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 沒有證據指出這個簽章屬於這個持有者.\n"
- #: g10/pkclist.c:640
++#: g10/pkclist.c:641
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告: 我們 *不* 信任這把金鑰!\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:642
msgid " The signature is probably a FORGERY.\n"
msgstr " 這個簽章很有可能是 *偽造的*.\n"
- #: g10/pkclist.c:649
++#: g10/pkclist.c:650
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
- #: g10/pkclist.c:651
++#: g10/pkclist.c:652
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 這份簽章並不屬於這個持有者\n"
- #: g10/pkclist.c:808 g10/pkclist.c:826 g10/pkclist.c:954 g10/pkclist.c:995
++#: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:955 g10/pkclist.c:996
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: 已跳過: %s\n"
- #: g10/pkclist.c:837
++#: g10/pkclist.c:838
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: 已跳過: 公鑰已停用\n"
- #: g10/pkclist.c:856 g10/pkclist.c:966
++#: g10/pkclist.c:857 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳過: 公鑰已存在\n"
- #: g10/pkclist.c:1015
++#: g10/pkclist.c:1016
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
- #: g10/pkclist.c:1039
++#: g10/pkclist.c:1040
msgid "Current recipients:\n"
msgstr "目前的收件者:\n"
- #: g10/pkclist.c:1065
++#: g10/pkclist.c:1066
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -5968,73 -4786,56 +6111,73 @@@ msgstr "
"\n"
"請輸入使用者 ID. 以空白列結束: "
- #: g10/pkclist.c:1089
++#: g10/pkclist.c:1090
msgid "No such user ID.\n"
msgstr "沒有這個使用者 ID.\n"
- #: g10/pkclist.c:1099 g10/pkclist.c:1174
++#: g10/pkclist.c:1100 g10/pkclist.c:1175
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳過: 公鑰已經被設成預設收件者\n"
- #: g10/pkclist.c:1120
++#: g10/pkclist.c:1121
msgid "Public key is disabled.\n"
msgstr "公鑰已停用.\n"
- #: g10/pkclist.c:1130
++#: g10/pkclist.c:1131
msgid "skipped: public key already set\n"
msgstr "已跳過: 公鑰已設過\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1166
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的預設收件者 \"%s\"\n"
- #: g10/pkclist.c:1211
++#: g10/pkclist.c:1213
msgid "no valid addressees\n"
msgstr "沒有有效的地址\n"
- #: g10/pkclist.c:1541
++#: g10/pkclist.c:1543
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
- #: g10/pkclist.c:1566
++#: g10/pkclist.c:1568
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
- #: g10/plaintext.c:109
++#: g10/plaintext.c:85
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
- #: g10/plaintext.c:160 g10/plaintext.c:169 g10/plaintext.c:175
- #: g10/plaintext.c:198
++#: g10/plaintext.c:137 g10/plaintext.c:146 g10/plaintext.c:152
++#: g10/plaintext.c:175
#, c-format
msgid "error creating '%s': %s\n"
msgstr "建立 '%s' 時出錯: %s\n"
- #: g10/plaintext.c:550
++#: g10/plaintext.c:592
msgid "Detached signature.\n"
msgstr "分離的簽章.\n"
- #: g10/plaintext.c:558
++#: g10/plaintext.c:600
msgid "Please enter name of data file: "
msgstr "請輸入資料檔的名稱: "
- #: g10/plaintext.c:595
++#: g10/plaintext.c:637
msgid "reading stdin ...\n"
msgstr "正在讀取標準輸入中 ...\n"
- #: g10/plaintext.c:640
++#: g10/plaintext.c:682
msgid "no signed data\n"
msgstr "沒有被簽署過的資料\n"
- #: g10/plaintext.c:658
++#: g10/plaintext.c:700
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "無法開啟被簽署過的資料 '%s'\n"
- #: g10/plaintext.c:693
++#: g10/plaintext.c:735
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
@@@ -6071,8 -4865,6 +6214,8 @@@ msgstr "請注意: 私鑰 %s 已於 %s
msgid "Note: key has been revoked"
msgstr "請注意: 金鑰已撤銷"
+#: g10/revoke.c:102 g10/revoke.c:128 g10/revoke.c:174 g10/revoke.c:186
- #: g10/revoke.c:493
++#: g10/revoke.c:501
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet 失敗: %s\n"
@@@ -6082,41 -4873,37 +6225,47 @@@
msgid "key %s has no user IDs\n"
msgstr "金鑰 %s 沒有使用者 ID\n"
- #: g10/revoke.c:308
++#: g10/revoke.c:313
msgid "To be revoked by:\n"
msgstr "將被撤銷:\n"
- #: g10/revoke.c:312
++#: g10/revoke.c:317
msgid "(This is a sensitive revocation key)\n"
msgstr "(這是把機密的撤銷金鑰)\n"
- #: g10/revoke.c:316
++#: g10/revoke.c:323
+ #, fuzzy
+ #| msgid "Secret key is available.\n"
+ msgid "Secret key is not available.\n"
+ msgstr "私鑰可用.\n"
+
++#: g10/revoke.c:328
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
- #: g10/revoke.c:329 g10/revoke.c:661
++#: g10/revoke.c:337 g10/revoke.c:721
msgid "ASCII armored output forced.\n"
msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
- #: g10/revoke.c:345 g10/revoke.c:472
++#: g10/revoke.c:353 g10/revoke.c:480
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet 失敗: %s\n"
- #: g10/revoke.c:408
++#: g10/revoke.c:416
msgid "Revocation certificate created.\n"
msgstr "已建立撤銷憑證.\n"
- #: g10/revoke.c:414
++#: g10/revoke.c:422
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
- #: g10/revoke.c:544
++#: g10/revoke.c:552
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "這把 OpenPGP 金鑰有一份撤銷憑證."
- #: g10/revoke.c:560
++#: g10/revoke.c:568
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"
@@@ -6128,7 -4915,6 +6277,7 @@@ msgstr "
"辦法是產生一份新的撤銷憑證, 並且指明撤銷\n"
"的理由."
- #: g10/revoke.c:564
++#: g10/revoke.c:572
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"
@@@ -6138,11 -4924,21 +6287,25 @@@ msgstr "
"真的要使用這份撤銷憑證前, 請先用文字編輯器把那個冒號移除,\n"
"撤銷憑證才能使用."
- #: g10/revoke.c:645
++#: g10/revoke.c:628
+ #, fuzzy, c-format
+ #| msgid "secret key \"%s\" not found: %s\n"
+ msgid "secret key \"%s\" not found\n"
+ msgstr "找不到私鑰 \"%s\": %s\n"
+
+ #. TRANSLATORS: The %s prints a key specification which
+ #. for example has been given at the command line. Several lines
+ #. lines with secret key infos are printed after this message.
++#: g10/revoke.c:655
+ #, c-format
+ msgid "'%s' matches multiple secret keys:\n"
+ msgstr ""
+
++#: g10/revoke.c:705
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
- #: g10/revoke.c:669
++#: g10/revoke.c:729
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6161,33 -4957,26 +6324,33 @@@ msgstr "
"但是千萬小心: 你的機器上的列印系統可能會在列印過\n"
"程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
- #: g10/revoke.c:703
++#: g10/revoke.c:763
msgid "Please select the reason for the revocation:\n"
msgstr "請選擇撤銷的原因:\n"
- #: g10/revoke.c:713
++#: g10/revoke.c:773
msgid "Cancel"
msgstr "取消"
- #: g10/revoke.c:715
++#: g10/revoke.c:775
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(也許你會想要在這裡選擇 %d)\n"
- #: g10/revoke.c:756
++#: g10/revoke.c:816
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "請輸入選用的描述; 以空白列結束:\n"
- #: g10/revoke.c:784
++#: g10/revoke.c:844
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "撤銷原因: %s\n"
- #: g10/revoke.c:786
++#: g10/revoke.c:846
msgid "(No description given)\n"
msgstr "(沒有給定描述)\n"
- #: g10/revoke.c:791
++#: g10/revoke.c:851
msgid "Is this okay? (y/N) "
msgstr "這樣可以嗎? (y/N) "
@@@ -6210,68 -4995,55 +6373,68 @@@ msgstr "%s 金鑰 %s 使用不安全 (%
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "%s 金鑰 %s 需要 %zu 位元以上的雜湊 (雜湊為 %s)\n"
- #: g10/sig-check.c:81
++#: g10/sig-check.c:113
msgid "WARNING: signature digest conflict in message\n"
msgstr "警告: 簽章摘要與訊息不一致\n"
- #: g10/sig-check.c:108
++#: g10/sig-check.c:140
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
- #: g10/sig-check.c:110
++#: g10/sig-check.c:142
#, c-format
msgid "please see %s for more information\n"
msgstr "請參考 %s 上進一步的資訊\n"
- #: g10/sig-check.c:120
++#: g10/sig-check.c:152
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
- #: g10/sig-check.c:222
++#: g10/sig-check.c:271
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
- #: g10/sig-check.c:223
++#: g10/sig-check.c:272
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
- #: g10/sig-check.c:234
++#: g10/sig-check.c:283
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/sig-check.c:236
++#: g10/sig-check.c:285
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/sig-check.c:250
++#: g10/sig-check.c:299
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
- #: g10/sig-check.c:261
++#: g10/sig-check.c:310
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "請注意: 簽章金鑰 %s 已遭撤銷\n"
- #: g10/sig-check.c:341
++#: g10/sig-check.c:426
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
- #: g10/sig-check.c:607
++#: g10/sig-check.c:765
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
- #: g10/sig-check.c:634
++#: g10/sig-check.c:792
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
@@@ -6309,29 -5075,23 +6472,29 @@@ msgstr "警告: 強迫使用 %s (%d) �
msgid "signing:"
msgstr "簽署:"
- #: g10/sign.c:1254
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密將被採用\n"
- #: g10/skclist.c:148 g10/skclist.c:229
++#: g10/skclist.c:149 g10/skclist.c:230
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
- #: g10/skclist.c:180
++#: g10/skclist.c:181
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "已跳過 \"%s\": 重複了\n"
- #: g10/skclist.c:199
++#: g10/skclist.c:200
msgid "skipped: secret key already present\n"
msgstr "已跳過: 私鑰已經存在\n"
- #: g10/skclist.c:218
++#: g10/skclist.c:219
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
- #: g10/tdbdump.c:58 g10/trustdb.c:354
++#: g10/tdbdump.c:58 g10/trustdb.c:362
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@@ -6376,7 -5128,6 +6539,7 @@@ msgstr "在 '%s' 中尋找信任記錄�
msgid "read error in '%s': %s\n"
msgstr "'%s' 讀取錯誤: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:369
++#: g10/tdbdump.c:231 g10/trustdb.c:377
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "信任資料庫: 同步化失敗: %s\n"
@@@ -6405,7 -5151,6 +6568,7 @@@ msgstr "信任資料庫記錄 %lu: 寫�
msgid "trustdb transaction too large\n"
msgstr "信任資料庫更動量過大\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:590
++#: g10/tdbio.c:659 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "無法存取 '%s': %s\n"
@@@ -6519,117 -5241,93 +6682,117 @@@ msgstr "無法處理長於 %d 字符的
msgid "input line longer than %d characters\n"
msgstr "輸入列比 %d 字符還長\n"
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s' 不是有效的長式金鑰 ID\n"
- #: g10/trustdb.c:246
++#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
- #: g10/trustdb.c:284
++#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
- #: g10/trustdb.c:299
++#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
- #: g10/trustdb.c:309
++#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "金鑰 %s 已標記成徹底信任了\n"
- #: g10/trustdb.c:333
++#: g10/trustdb.c:341
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
- #: g10/trustdb.c:339
++#: g10/trustdb.c:347
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
- #: g10/trustdb.c:412
++#: g10/trustdb.c:422
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "你可以試著用下列指令來重建信任資料庫:\n"
- #: g10/trustdb.c:421
++#: g10/trustdb.c:431
msgid "If that does not work, please consult the manual\n"
msgstr "如果行不通的話, 請查閱手冊\n"
- #: g10/trustdb.c:456
++#: g10/trustdb.c:468
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
- #: g10/trustdb.c:462
++#: g10/trustdb.c:474
#, c-format
msgid "using %s trust model\n"
msgstr "正在使用 %s 信任模型\n"
- #: g10/trustdb.c:496
++#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
msgstr "不需要檢查信任資料庫\n"
- #: g10/trustdb.c:502 g10/trustdb.c:1984
++#: g10/trustdb.c:516 g10/trustdb.c:2116
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任資料庫檢查將於 %s 進行\n"
- #: g10/trustdb.c:511
++#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
- #: g10/trustdb.c:526
++#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
- #: g10/trustdb.c:734 g10/trustdb.c:1158
++#: g10/trustdb.c:749 g10/trustdb.c:1279
#, c-format
msgid "public key %s not found: %s\n"
msgstr "找不到公鑰 %s: %s\n"
- #: g10/trustdb.c:952
++#: g10/trustdb.c:968
msgid "please do a --check-trustdb\n"
msgstr "請做一次 --check-trustdb\n"
- #: g10/trustdb.c:957
++#: g10/trustdb.c:973
msgid "checking the trustdb\n"
msgstr "正在檢查信任資料庫\n"
- #: g10/trustdb.c:1727
++#: g10/trustdb.c:1848
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
- #: g10/trustdb.c:1792
++#: g10/trustdb.c:1916
msgid "no ultimately trusted keys found\n"
msgstr "沒有找到任何徹底信任的金鑰\n"
- #: g10/trustdb.c:1806
++#: g10/trustdb.c:1930
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
- #: g10/trustdb.c:1829
++#: g10/trustdb.c:1958
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
- #: g10/trustdb.c:1915
++#: g10/trustdb.c:2044
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr "深度: %d 有效: %3d 已簽署: %3d 信任: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:1990
++#: g10/trustdb.c:2123
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@@ -6865,11 -5514,9 +7028,11 @@@ msgstr "用於 CHV%d 的個人識別�
msgid "verify CHV%d failed: %s\n"
msgstr "驗證 CHV%d 失敗: %s\n"
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4290
++#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2247 scd/app-openpgp.c:4338
msgid "error retrieving CHV status from card\n"
msgstr "從卡片取回 CHV 狀態時出錯\n"
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4299
++#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4347
msgid "card is permanently locked!\n"
msgstr "卡片永久鎖定了!!\n"
@@@ -7000,12 -5619,10 +7163,12 @@@ msgstr "卡片不支援 %s 摘要演算
msgid "signatures created so far: %lu\n"
msgstr "目前建立的簽章: %lu\n"
- #: scd/app-openpgp.c:4304
++#: scd/app-openpgp.c:4352
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
- #: scd/app-openpgp.c:4598 scd/app-openpgp.c:4609
++#: scd/app-openpgp.c:4646 scd/app-openpgp.c:4657
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@@ -7025,7 -5639,6 +7188,7 @@@ msgstr "|N|開始新增個人識別碼
msgid "run in multi server mode (foreground)"
msgstr "以多重伺服器模式執行 (前景)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:175
++#: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|等級|設定除錯等級為指定等級"
@@@ -7081,12 -5682,10 +7244,12 @@@ msgstr "
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
- #: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1989
++#: scd/scdaemon.c:1159 dirmngr/dirmngr.c:1999
#, c-format
msgid "handler for fd %d started\n"
msgstr "用於 fd %d 的經手程式已啟動\n"
- #: scd/scdaemon.c:1182 dirmngr/dirmngr.c:1994
++#: scd/scdaemon.c:1171 dirmngr/dirmngr.c:2004
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "用於 fd %d 的經手程式已終止\n"
@@@ -7499,7 -6006,6 +7662,7 @@@ msgstr "第 %d 列: 以金鑰鑰柄 '%s
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "第 %d 列: 金鑰產生失敗: %s <%s>\n"
- #: sm/certreqgen.c:1309
++#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8070,7 -6456,6 +8233,7 @@@ msgstr "固定載入的憑證: %u\n
msgid " runtime cached certificates: %u\n"
msgstr " 執行時期快取的憑證: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:369
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
msgid "certificate already cached\n"
msgstr "憑證早已快取\n"
@@@ -8078,8 -6462,6 +8241,8 @@@
msgid "certificate cached\n"
msgstr "憑證已快取\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:373
++#: dirmngr/dirmngr-client.c:384
#, c-format
msgid "error caching certificate: %s\n"
msgstr "快取憑證時出錯: %s\n"
@@@ -8138,7 -6509,6 +8301,7 @@@ msgstr "正在移除快取檔案 '%s'\n
msgid "not removing file '%s'\n"
msgstr "不移除檔案 '%s'\n"
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2204
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2206
#, c-format
msgid "error closing cache file: %s\n"
msgstr "關閉快取檔案時出錯: %s\n"
@@@ -8357,212 -6683,169 +8520,212 @@@ msgstr "S/N %s 有效, 但位列入 CR
msgid "error getting data from cache file: %s\n"
msgstr "從快取檔案取得資料時出錯: %s\n"
- #: dirmngr/crlcache.c:1540 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1541 dirmngr/validate.c:882
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "未知的雜湊演算法 '%s'\n"
- #: dirmngr/crlcache.c:1547
++#: dirmngr/crlcache.c:1548
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
msgstr "演算法 %d 的 gcry_md_open 失敗: %s\n"
- #: dirmngr/crlcache.c:1584 dirmngr/crlcache.c:1603
++#: dirmngr/crlcache.c:1585 dirmngr/crlcache.c:1604
msgid "got an invalid S-expression from libksba\n"
msgstr "從 libksba 得到無效的 S-表示式\n"
- #: dirmngr/crlcache.c:1591 dirmngr/crlcache.c:1610 dirmngr/misc.c:168
++#: dirmngr/crlcache.c:1592 dirmngr/crlcache.c:1611 dirmngr/misc.c:168
#, c-format
msgid "converting S-expression failed: %s\n"
msgstr "轉換 S-表示式時失敗: %s\n"
- #: dirmngr/crlcache.c:1625 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1626 dirmngr/ocsp.c:425
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "建立 S-表示式時失敗: %s\n"
- #: dirmngr/crlcache.c:1697
++#: dirmngr/crlcache.c:1698
#, c-format
msgid "ksba_crl_parse failed: %s\n"
msgstr "ksba_crl_parse 失敗: %s\n"
- #: dirmngr/crlcache.c:1711
++#: dirmngr/crlcache.c:1713
#, c-format
msgid "error getting update times of CRL: %s\n"
msgstr "取得 CRL 更新時間時出錯: %s\n"
- #: dirmngr/crlcache.c:1718
++#: dirmngr/crlcache.c:1720
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
msgstr "此 CRL 的更新時間: 本次=%s 下次=%s\n"
- #: dirmngr/crlcache.c:1722
++#: dirmngr/crlcache.c:1724
msgid "nextUpdate not given; assuming a validity period of one day\n"
msgstr "無給定 nextUpdate; 先假設有效期是一天\n"
- #: dirmngr/crlcache.c:1742
++#: dirmngr/crlcache.c:1744
#, c-format
msgid "error getting CRL item: %s\n"
msgstr "取得 CRL 項目時出錯: %s\n"
- #: dirmngr/crlcache.c:1757
++#: dirmngr/crlcache.c:1759
#, c-format
msgid "error inserting item into temporary cache file: %s\n"
msgstr "安插項目至暫存快取檔案時出錯: %s\n"
- #: dirmngr/crlcache.c:1784
++#: dirmngr/crlcache.c:1786
#, c-format
msgid "no CRL issuer found in CRL: %s\n"
msgstr "CRL 中找不到 CRL 發行者: %s\n"
- #: dirmngr/crlcache.c:1799
++#: dirmngr/crlcache.c:1801
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
msgstr "正在以 authorityKeyIdentifier 找出 CRL 發行者憑證位置\n"
- #: dirmngr/crlcache.c:1844
++#: dirmngr/crlcache.c:1846
#, c-format
msgid "CRL signature verification failed: %s\n"
msgstr "CRL 簽章驗證失敗: %s\n"
- #: dirmngr/crlcache.c:1855
++#: dirmngr/crlcache.c:1857
#, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
msgstr "檢查 CRL 發行者憑證有效性時出錯: %s\n"
- #: dirmngr/crlcache.c:1998
++#: dirmngr/crlcache.c:2000
#, c-format
msgid "ksba_crl_new failed: %s\n"
msgstr "ksba_crl_new 失敗: %s\n"
- #: dirmngr/crlcache.c:2005
++#: dirmngr/crlcache.c:2007
#, c-format
msgid "ksba_crl_set_reader failed: %s\n"
msgstr "ksba_crl_set_reader 失敗: %s\n"
- #: dirmngr/crlcache.c:2039
++#: dirmngr/crlcache.c:2041
#, c-format
msgid "removed stale temporary cache file '%s'\n"
msgstr "已移除陳舊的暫存快取檔案 '%s'\n"
- #: dirmngr/crlcache.c:2043
++#: dirmngr/crlcache.c:2045
#, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
msgstr "移除陳舊的暫存快取檔案 '%s' 時發生問題: %s\n"
- #: dirmngr/crlcache.c:2053
++#: dirmngr/crlcache.c:2055
#, c-format
msgid "error creating temporary cache file '%s': %s\n"
msgstr "建立暫存快取檔案 '%s' 時出錯: %s\n"
- #: dirmngr/crlcache.c:2063
++#: dirmngr/crlcache.c:2065
#, c-format
msgid "crl_parse_insert failed: %s\n"
msgstr "crl_parse_insert 失敗: %s\n"
- #: dirmngr/crlcache.c:2073
++#: dirmngr/crlcache.c:2075
#, c-format
msgid "error finishing temporary cache file '%s': %s\n"
msgstr "完成暫存快取檔案 '%s' 時出錯: %s\n"
- #: dirmngr/crlcache.c:2080
++#: dirmngr/crlcache.c:2082
#, c-format
msgid "error closing temporary cache file '%s': %s\n"
msgstr "關閉暫存快取檔案 '%s' 時出錯: %s\n"
- #: dirmngr/crlcache.c:2105
++#: dirmngr/crlcache.c:2107
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr "警告: 新的 CRL 仍然太老舊; 早已在 %s 逾期 - 不過還是載入\n"
- #: dirmngr/crlcache.c:2109
++#: dirmngr/crlcache.c:2111
#, c-format
msgid "new CRL still too old; it expired on %s\n"
msgstr "新的 CRL 仍然太老舊; 早已在 %s 逾期\n"
- #: dirmngr/crlcache.c:2125
++#: dirmngr/crlcache.c:2127
#, c-format
msgid "unknown critical CRL extension %s\n"
msgstr "未知的關鍵 CRL 擴充欄位 %s\n"
- #: dirmngr/crlcache.c:2135
++#: dirmngr/crlcache.c:2137
#, c-format
msgid "error reading CRL extensions: %s\n"
msgstr "讀取 CRL 擴充欄位時出錯: %s\n"
- #: dirmngr/crlcache.c:2186
++#: dirmngr/crlcache.c:2188
#, c-format
msgid "creating cache file '%s'\n"
msgstr "建立快取檔案 '%s' 時出錯\n"
- #: dirmngr/crlcache.c:2218
++#: dirmngr/crlcache.c:2220
#, c-format
msgid "problem renaming '%s' to '%s': %s\n"
msgstr "把 '%s' 重新新命成 '%s' 時發生問題: %s\n"
- #: dirmngr/crlcache.c:2232
++#: dirmngr/crlcache.c:2234
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr "更新 DIR 檔案時失敗 - 下次程式啟動時將失去快取項目\n"
- #: dirmngr/crlcache.c:2269
++#: dirmngr/crlcache.c:2271
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
msgstr "開始 CRL 傾印 (經由 %s 取得)\n"
- #: dirmngr/crlcache.c:2292
++#: dirmngr/crlcache.c:2294
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
msgstr " 錯誤: 將不採用此 CRL, 因為更新之後仍然太過老舊!\n"
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
msgstr " 錯誤: 將不採用此 CRL, 因為有未知的關鍵擴充欄位!\n"
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
msgid " ERROR: The CRL will not be used\n"
msgstr " 錯誤: 將不採用此 CRL\n"
- #: dirmngr/crlcache.c:2305
++#: dirmngr/crlcache.c:2307
msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr " 錯誤: 這個快取中的 CRL 可能已遭竄改!\n"
- #: dirmngr/crlcache.c:2323
++#: dirmngr/crlcache.c:2325
msgid " WARNING: invalid cache record length\n"
msgstr " 警告: 無效的快取記錄長度\n"
- #: dirmngr/crlcache.c:2330
++#: dirmngr/crlcache.c:2332
#, c-format
msgid "problem reading cache record: %s\n"
msgstr "讀取快取記錄時發生問題: %s\n"
- #: dirmngr/crlcache.c:2341
++#: dirmngr/crlcache.c:2343
#, c-format
msgid "problem reading cache key: %s\n"
msgstr "讀取快取金鑰時發生問題: %s\n"
- #: dirmngr/crlcache.c:2372
++#: dirmngr/crlcache.c:2374
#, c-format
msgid "error reading cache entry from db: %s\n"
msgstr "從資料庫讀取快取項目時出錯: %s\n"
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
msgid "End CRL dump\n"
msgstr "CRL 傾印結束\n"
- #: dirmngr/crlcache.c:2496
++#: dirmngr/crlcache.c:2498
#, c-format
msgid "crl_fetch via DP failed: %s\n"
msgstr "經由 DP 的 crl_fetch 失敗: %s\n"
- #: dirmngr/crlcache.c:2507
++#: dirmngr/crlcache.c:2509
#, c-format
msgid "crl_cache_insert via DP failed: %s\n"
msgstr "經由 DP 的 crl_cache_insert 失敗: %s\n"
- #: dirmngr/crlcache.c:2567
++#: dirmngr/crlcache.c:2569
#, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
msgstr "經由發行者的 crl_cache_insert 失敗: %s\n"
@@@ -8606,67 -6879,51 +8769,67 @@@ msgstr "取回 '%s' 時出錯: %s\n
msgid "error retrieving '%s': http status %u\n"
msgstr "取回 '%s' 時出錯: http 狀態 %u\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
#, fuzzy
#| msgid "CRL access not possible due to disabled %s\n"
- msgid "CRL access not possible due to TOR mode\n"
+ msgid "CRL access not possible due to Tor mode\n"
msgstr "不可能存取 CRL 因已停用 %s\n"
+#: dirmngr/crlfetch.c:386
#, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr "不可能進行憑證搜尋, 因為已停用 %s\n"
- #: dirmngr/dirmngr-client.c:70
++#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
msgstr "改以 OCSP 代替 CRL"
- #: dirmngr/dirmngr-client.c:71
++#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
msgstr "檢查 dirmngr 是否正在執行"
- #: dirmngr/dirmngr-client.c:72
++#: dirmngr/dirmngr-client.c:73
msgid "add a certificate to the cache"
msgstr "加入憑證至快取"
- #: dirmngr/dirmngr-client.c:73
++#: dirmngr/dirmngr-client.c:74
msgid "validate a certificate"
msgstr "驗證憑證"
- #: dirmngr/dirmngr-client.c:74
++#: dirmngr/dirmngr-client.c:75
msgid "lookup a certificate"
msgstr "查找憑證"
- #: dirmngr/dirmngr-client.c:75
++#: dirmngr/dirmngr-client.c:76
msgid "lookup only locally stored certificates"
msgstr "僅查找存放於本地端的憑證憑證"
- #: dirmngr/dirmngr-client.c:76
++#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
msgstr "應該要給 --lookup 某個網址"
- #: dirmngr/dirmngr-client.c:77
++#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
msgstr "載入 CRL 至 dirmngr"
- #: dirmngr/dirmngr-client.c:78
++#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
msgstr "搭配 Squid 使用的特殊模式"
- #: dirmngr/dirmngr-client.c:79
++#: dirmngr/dirmngr-client.c:80
msgid "expect certificates in PEM format"
msgstr "預期憑證應為 PEM 格式"
- #: dirmngr/dirmngr-client.c:81
++#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
msgstr "強制使用預設的 OCSP 回應程式"
- #: dirmngr/dirmngr-client.c:151
++#: dirmngr/dirmngr-client.c:150
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "用法: dirmngr-client [選項] [憑證檔案|模式](或用 -h 求助)\n"
- #: dirmngr/dirmngr-client.c:155
++#: dirmngr/dirmngr-client.c:154
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -8678,214 -6935,143 +8841,187 @@@ msgstr "
"如果憑證有效, 此程序將傳回 0; 如果憑證無效\n"
"則傳回 1; 其他錯誤代碼則代表不同的一般性失敗\n"
- #: dirmngr/dirmngr-client.c:269 dirmngr/dirmngr-client.c:1002
++#: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "從標準輸入讀取憑證時出錯: %s\n"
- #: dirmngr/dirmngr-client.c:276
++#: dirmngr/dirmngr-client.c:275
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "從 '%s' 讀取憑證時出錯: %s\n"
- #: dirmngr/dirmngr-client.c:290
++#: dirmngr/dirmngr-client.c:289
msgid "certificate too large to make any sense\n"
msgstr "憑證大到全然不合理的境界\n"
- #: dirmngr/dirmngr-client.c:316
++#: dirmngr/dirmngr-client.c:305
+ #, c-format
+ msgid "can't connect to the dirmngr: %s\n"
+ msgstr "無法連接至 dirmngr: %s\n"
+
++#: dirmngr/dirmngr-client.c:327
#, c-format
msgid "lookup failed: %s\n"
msgstr "查找失敗: %s\n"
- #: dirmngr/dirmngr-client.c:331
++#: dirmngr/dirmngr-client.c:342
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "載入 CRL '%s' 時失敗: %s\n"
- #: dirmngr/dirmngr-client.c:359
++#: dirmngr/dirmngr-client.c:370
msgid "a dirmngr daemon is up and running\n"
msgstr "有個 dirmngr 服務已啟動並正在執行中\n"
- #: dirmngr/dirmngr-client.c:381
++#: dirmngr/dirmngr-client.c:392
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "憑證之驗證失敗: %s\n"
- #: dirmngr/dirmngr-client.c:388 dirmngr/dirmngr-client.c:1013
++#: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
msgid "certificate is valid\n"
msgstr "憑證有效\n"
- #: dirmngr/dirmngr-client.c:394 dirmngr/dirmngr-client.c:1021
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
msgid "certificate has been revoked\n"
msgstr "憑證已遭撤銷\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:1023
++#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
#, c-format
msgid "certificate check failed: %s\n"
msgstr "憑證檢查失敗: %s\n"
- #: dirmngr/dirmngr-client.c:412
++#: dirmngr/dirmngr-client.c:423
#, c-format
msgid "got status: '%s'\n"
msgstr "得到狀態: '%s'\n"
- #: dirmngr/dirmngr-client.c:427
++#: dirmngr/dirmngr-client.c:438
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "寫入 base64 編碼時出錯: %s\n"
- #: dirmngr/dirmngr-client.c:457 dirmngr/server.c:2283
- #, c-format
- msgid "failed to allocate assuan context: %s\n"
- msgstr "配置 assuan 脈絡失敗: %s\n"
-
- #: dirmngr/dirmngr-client.c:471
- msgid "apparently no running dirmngr\n"
- msgstr "顯然沒有執行中的 dirmngr\n"
-
- #: dirmngr/dirmngr-client.c:476
- msgid "no running dirmngr - starting one\n"
- msgstr "沒有執行中的 dirmngr - 正在啟動一個出來\n"
-
- #: dirmngr/dirmngr-client.c:509
- #, c-format
- msgid "malformed %s environment variable\n"
- msgstr "格式不對的 %s 環境變數\n"
-
- #: dirmngr/dirmngr-client.c:525
- #, c-format
- msgid "dirmngr protocol version %d is not supported\n"
- msgstr "未支援 dirmngr 協定版本 %d\n"
-
- #: dirmngr/dirmngr-client.c:541
- msgid "can't connect to the dirmngr - trying fall back\n"
- msgstr "無法連線至 dirmngr - 正試著退回\n"
-
- #: dirmngr/dirmngr-client.c:550
- #, c-format
- msgid "can't connect to the dirmngr: %s\n"
- msgstr "無法連接至 dirmngr: %s\n"
-
- #: dirmngr/dirmngr-client.c:799
++#: dirmngr/dirmngr-client.c:685
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "未支援的查詢 '%s'\n"
- #: dirmngr/dirmngr-client.c:901
++#: dirmngr/dirmngr-client.c:787
msgid "absolute file name expected\n"
msgstr "應該要有絕對檔名\n"
- #: dirmngr/dirmngr-client.c:946
++#: dirmngr/dirmngr-client.c:832
#, c-format
msgid "looking up '%s'\n"
msgstr "正在查找 '%s'\n"
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
msgstr "以視窗服務模式執行 (背景)"
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
msgstr "列出 CRL 快取的內容"
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
msgid "|FILE|load CRL from FILE into cache"
msgstr "|檔案|從指定檔案載入 CRL 至快取"
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
msgstr "|網址|從指定網址取得 CRL"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
msgstr "關閉 dirmngr"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
msgid "flush the cache"
msgstr "清除快取"
- #: dirmngr/dirmngr.c:178 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
++#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:803 tools/gpgconf-comp.c:890
msgid "|FILE|write server mode logs to FILE"
msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:181
msgid "run without asking a user"
msgstr "以不詢問使用者的方式執行"
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
msgstr "強迫載入過時的 CRL"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
msgstr "允許送出 OCSP 請求"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
msgstr "避免使用 HTTP"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
msgstr "避免使用 LDAP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
msgstr "忽略 HTTP CRL 分布點"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
msgstr "忽略 LDAP CRL 分布點"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
msgstr "忽略含有 OCSP 伺服器網址的憑證"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
msgstr "|主機|指定 LDAP 查詢主機"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "不要將主機備案與 --ldap-proxy 並用"
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
msgid "|FILE|read LDAP server list from FILE"
msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|把 LDAP 逾時設成 N 秒"
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:209
msgid "|URL|use OCSP responder at URL"
msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
msgstr "|N|單次查詢不要傳回超過 N 筆項目"
- #: dirmngr/dirmngr.c:219
++#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
- #: dirmngr/dirmngr.c:221
- msgid "route all network traffic via TOR"
++#: dirmngr/dirmngr.c:224
+ msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:238
++#: dirmngr/dirmngr.c:241
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -8894,11 -7080,9 +9030,11 @@@ msgstr "
"@\n"
"(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
- #: dirmngr/dirmngr.c:350
++#: dirmngr/dirmngr.c:353
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
- #: dirmngr/dirmngr.c:352
++#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -8906,77 -7090,60 +9042,77 @@@ msgstr "
"語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
"@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
- #: dirmngr/dirmngr.c:432
++#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "有效的除錯等級為: %s\n"
- #: dirmngr/dirmngr.c:471 tools/gpgconf.c:232 tools/gpgconf.c:266
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:232 tools/gpgconf.c:266
+#: tools/gpgconf.c:337
#, c-format
msgid "usage: %s [options] "
msgstr "用法: %s [選項] "
- #: dirmngr/dirmngr.c:1104
++#: dirmngr/dirmngr.c:1124
msgid "colons are not allowed in the socket name\n"
msgstr "socket 名稱內不允許使用冒號\n"
- #: dirmngr/dirmngr.c:1351 dirmngr/server.c:1491
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1357 dirmngr/server.c:1497
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1582
++#: dirmngr/dirmngr.c:1591
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: 列太長 - 已跳過\n"
- #: dirmngr/dirmngr.c:1637 dirmngr/dirmngr.c:1721
++#: dirmngr/dirmngr.c:1646 dirmngr/dirmngr.c:1730
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: 偵測到無效的指紋\n"
- #: dirmngr/dirmngr.c:1673 dirmngr/dirmngr.c:1699
++#: dirmngr/dirmngr.c:1682 dirmngr/dirmngr.c:1708
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: 讀取錯誤: %s\n"
- #: dirmngr/dirmngr.c:1728
++#: dirmngr/dirmngr.c:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: 列尾的垃圾已忽略\n"
- #: dirmngr/dirmngr.c:1794
++#: dirmngr/dirmngr.c:1804
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
- #: dirmngr/dirmngr.c:1821
++#: dirmngr/dirmngr.c:1831
msgid "SIGUSR2 received - no action defined\n"
msgstr "收到 SIGUSR2 - 無定義行動\n"
- #: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1917
++#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
msgid "SIGTERM received - shutting down ...\n"
msgstr "收到 SIGTERM - 正在關閉 ...\n"
- #: dirmngr/dirmngr.c:1828
++#: dirmngr/dirmngr.c:1838
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
- #: dirmngr/dirmngr.c:1833 dirmngr/dirmngr.c:1920
++#: dirmngr/dirmngr.c:1843 dirmngr/dirmngr.c:1930
msgid "shutdown forced\n"
msgstr "已強迫關閉\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1851
msgid "SIGINT received - immediate shutdown\n"
msgstr "收到 SIGINT - 立即關閉\n"
- #: dirmngr/dirmngr.c:1848
++#: dirmngr/dirmngr.c:1858
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "收到訊號 %d - 無定義行動\n"
@@@ -9217,12 -7333,10 +9353,12 @@@ msgstr "正在加入 '%s:%d' 至 ldap �
msgid "malloc failed: %s\n"
msgstr "動態記憶體配置失敗: %s\n"
- #: dirmngr/ldap.c:603
++#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
msgstr "start_cert_fetch: 無效的模式 '%s'\n"
- #: dirmngr/ldap.c:809
++#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
msgstr "ldap_search 達到伺服器的尺寸限制\n"
@@@ -9254,13 -7362,11 +9390,13 @@@ msgstr "從回應程式讀取時出錯
msgid "response from server too large; limit is %d bytes\n"
msgstr "來自伺服器的回應太大; 上限是 %d 位元組\n"
+#: dirmngr/ocsp.c:139
#, fuzzy
#| msgid "OCSP request not possible due to disabled HTTP\n"
- msgid "OCSP request not possible due to TOR mode\n"
+ msgid "OCSP request not possible due to Tor mode\n"
msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
@@@ -9403,71 -7479,60 +9539,76 @@@ msgstr "OCSP 回應程式傳回非當�
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP 回應程式傳回老舊的狀態\n"
- #: dirmngr/server.c:386 dirmngr/server.c:498 dirmngr/server.c:544
++#: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) 失敗: %s\n"
- #: dirmngr/server.c:844
++#: dirmngr/server.c:888
msgid "ldapserver missing"
msgstr "遺失 ldapserver"
- #: dirmngr/server.c:918
++#: dirmngr/server.c:962
msgid "serialno missing in cert ID"
msgstr "憑證 ID 中遺失 serialno"
- #: dirmngr/server.c:1054 dirmngr/server.c:1140 dirmngr/server.c:1576
- #: dirmngr/server.c:1627 dirmngr/server.c:2048 dirmngr/server.c:2064
++#: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
++#: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire 失敗: %s\n"
- #: dirmngr/server.c:1183
++#: dirmngr/server.c:1227
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url 失敗: %s\n"
- #: dirmngr/server.c:1195 dirmngr/server.c:1226 dirmngr/server.c:1385
++#: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
#, c-format
msgid "error sending data: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1377
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch 失敗: %s\n"
- #: dirmngr/server.c:1366
++#: dirmngr/server.c:1410
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert 失敗: %s\n"
- #: dirmngr/server.c:1393
++#: dirmngr/server.c:1437
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d 已超出\n"
- #: dirmngr/server.c:2272
++#: dirmngr/server.c:2398
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "無法配置控制結構: %s\n"
- #: dirmngr/server.c:2304
++#: dirmngr/server.c:2409
+ #, c-format
+ msgid "failed to allocate assuan context: %s\n"
+ msgstr "配置 assuan 脈絡失敗: %s\n"
+
++#: dirmngr/server.c:2430
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "伺服器啟始失敗: %s\n"
- #: dirmngr/server.c:2312
++#: dirmngr/server.c:2438
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "向 Assuan 註冊指令時失敗: %s\n"
- #: dirmngr/server.c:2352
++#: dirmngr/server.c:2478
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan 接受問題: %s\n"
- #: dirmngr/server.c:2371
++#: dirmngr/server.c:2497
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan 處理時失敗: %s\n"
@@@ -9711,13 -7716,11 +9852,13 @@@ msgstr "控制著輸出格式的選項
msgid "Options controlling the interactivity and enforcement"
msgstr "控制著互動及強制執行的選項"
+#: tools/gpgconf-comp.c:911
#, fuzzy
#| msgid "Options controlling the security"
- msgid "Options controlling the use of TOR"
+ msgid "Options controlling the use of Tor"
msgstr "控制著安全性的選項"
+#: tools/gpgconf-comp.c:925
msgid "Configuration for HTTP servers"
msgstr "HTTP 伺服器組態"
diff --cc scd/Makefile.in
index 527ba8c,0000000..0ae1402
mode 100644,000000..100644
--- a/scd/Makefile.in
+++ b/scd/Makefile.in
@@@ -1,778 -1,0 +1,780 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+libexec_PROGRAMS = scdaemon$(EXEEXT)
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(top_srcdir)/build-aux/depcomp
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+ at HAVE_W32_SYSTEM_TRUE@am__append_8 = scdaemon-w32info.o
+subdir = scd
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(libexecdir)"
+PROGRAMS = $(libexec_PROGRAMS)
+am__objects_1 = app-openpgp.$(OBJEXT) app-nks.$(OBJEXT) \
+ app-dinsig.$(OBJEXT) app-p15.$(OBJEXT) app-geldkarte.$(OBJEXT) \
+ app-sc-hsm.$(OBJEXT)
+am_scdaemon_OBJECTS = scdaemon.$(OBJEXT) command.$(OBJEXT) \
+ atr.$(OBJEXT) apdu.$(OBJEXT) ccid-driver.$(OBJEXT) \
+ iso7816.$(OBJEXT) app.$(OBJEXT) app-help.$(OBJEXT) \
+ $(am__objects_1)
+scdaemon_OBJECTS = $(am_scdaemon_OBJECTS)
+am__DEPENDENCIES_1 =
+scdaemon_DEPENDENCIES = $(libcommonpth) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(resource_objs)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(scdaemon_SOURCES)
+DIST_SOURCES = $(scdaemon_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
+ $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4) $(am__append_5) $(am__append_6) \
+ $(am__append_7)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs = $(am__append_8)
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \
+ $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
+
+card_apps = app-openpgp.c app-nks.c app-dinsig.c app-p15.c app-geldkarte.c app-sc-hsm.c
+scdaemon_SOURCES = \
+ scdaemon.c scdaemon.h \
+ command.c \
+ atr.c atr.h \
+ apdu.c apdu.h \
+ ccid-driver.c ccid-driver.h \
+ iso7816.c iso7816.h \
+ app.c app-common.h app-help.c $(card_apps)
+
+scdaemon_LDADD = $(libcommonpth) \
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
+ $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
+ $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scd/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu scd/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-libexecPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+
+clean-libexecPROGRAMS:
+ -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+
+scdaemon$(EXEEXT): $(scdaemon_OBJECTS) $(scdaemon_DEPENDENCIES) $(EXTRA_scdaemon_DEPENDENCIES)
+ @rm -f scdaemon$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(scdaemon_OBJECTS) $(scdaemon_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/apdu.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app-dinsig.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app-geldkarte.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app-help.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app-nks.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app-openpgp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app-p15.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app-sc-hsm.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/atr.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ccid-driver.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/command.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/iso7816.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/scdaemon.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(libexecdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libexecPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libexecPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libexecPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libexecPROGRAMS cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-libexecPROGRAMS \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-libexecPROGRAMS
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc sm/Makefile.in
index f37ca26,0000000..b075523
mode 100644,000000..100644
--- a/sm/Makefile.in
+++ b/sm/Makefile.in
@@@ -1,810 -1,0 +1,812 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = gpgsm$(EXEEXT)
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(top_srcdir)/build-aux/depcomp
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+ at HAVE_W32_SYSTEM_TRUE@am__append_8 = gpgsm-w32info.o
+subdir = sm
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_gpgsm_OBJECTS = gpgsm.$(OBJEXT) misc.$(OBJEXT) keydb.$(OBJEXT) \
+ server.$(OBJEXT) call-agent.$(OBJEXT) call-dirmngr.$(OBJEXT) \
+ fingerprint.$(OBJEXT) base64.$(OBJEXT) certlist.$(OBJEXT) \
+ certdump.$(OBJEXT) certcheck.$(OBJEXT) certchain.$(OBJEXT) \
+ keylist.$(OBJEXT) verify.$(OBJEXT) sign.$(OBJEXT) \
+ encrypt.$(OBJEXT) decrypt.$(OBJEXT) import.$(OBJEXT) \
+ export.$(OBJEXT) delete.$(OBJEXT) certreqgen.$(OBJEXT) \
+ certreqgen-ui.$(OBJEXT) minip12.$(OBJEXT) qualified.$(OBJEXT)
+gpgsm_OBJECTS = $(am_gpgsm_OBJECTS)
+am__DEPENDENCIES_1 =
+gpgsm_DEPENDENCIES = $(common_libs) ../common/libgpgrl.a \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(resource_objs) $(am__DEPENDENCIES_1)
+gpgsm_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgsm_LDFLAGS) \
+ $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(gpgsm_SOURCES)
+DIST_SOURCES = $(gpgsm_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -I$(top_srcdir)/common -DKEYBOX_WITH_X509=1 \
+ -DLOCALEDIR=\"$(localedir)\" $(am__append_1) $(am__append_2) \
+ $(am__append_3) $(am__append_4) $(am__append_5) \
+ $(am__append_6) $(am__append_7)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs = $(am__append_8)
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+gpgsm_SOURCES = \
+ gpgsm.c gpgsm.h \
+ misc.c \
+ keydb.c keydb.h \
+ server.c \
+ call-agent.c \
+ call-dirmngr.c \
+ fingerprint.c \
+ base64.c \
+ certlist.c \
+ certdump.c \
+ certcheck.c \
+ certchain.c \
+ keylist.c \
+ verify.c \
+ sign.c \
+ encrypt.c \
+ decrypt.c \
+ import.c \
+ export.c \
+ delete.c \
+ certreqgen.c \
+ certreqgen-ui.c \
+ minip12.c minip12.h \
+ qualified.c
+
+common_libs = ../kbx/libkeybox509.a $(libcommon)
+gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
+ $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \
+ $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+
+gpgsm_LDFLAGS = $(extra_bin_ldflags)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sm/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu sm/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+gpgsm$(EXEEXT): $(gpgsm_OBJECTS) $(gpgsm_DEPENDENCIES) $(EXTRA_gpgsm_DEPENDENCIES)
+ @rm -f gpgsm$(EXEEXT)
+ $(AM_V_CCLD)$(gpgsm_LINK) $(gpgsm_OBJECTS) $(gpgsm_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/base64.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call-agent.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call-dirmngr.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/certchain.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/certcheck.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/certdump.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/certlist.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/certreqgen-ui.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/certreqgen.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/decrypt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/delete.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/encrypt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/export.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fingerprint.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgsm.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/import.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keydb.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keylist.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/minip12.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/misc.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/qualified.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sign.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/verify.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ distclean distclean-compile distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-binPROGRAMS install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+# Make sure that all libs are build before we use them. This is
+# important for things like make -j2.
+$(PROGRAMS): $(common_libs)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc tests/Makefile.in
index d805a39,0000000..2a4212b
mode 100644,000000..100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1,900 -1,0 +1,902 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Makefile.am -tests makefile for libxtime
+# Copyright (C) 2002 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+TESTS =
+noinst_PROGRAMS = asschk$(EXEEXT)
+subdir = tests
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/build-aux/mkinstalldirs \
+ $(top_srcdir)/build-aux/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_asschk_OBJECTS = asschk.$(OBJEXT)
+asschk_OBJECTS = $(am_asschk_OBJECTS)
+asschk_LDADD = $(LDADD)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(asschk_SOURCES)
+DIST_SOURCES = $(asschk_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+DIST_SUBDIRS = openpgp . pkits
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ at RUN_GPG_TESTS_FALSE@openpgp =
+ at RUN_GPG_TESTS_TRUE@openpgp = openpgp
+SUBDIRS = ${openpgp} . pkits
+GPGSM = ../sm/gpgsm
+
+# Note that we need to use /bin/pwd so that we don't get into trouble
+# if the shell used for inittests would uses an internal version of
+# pwd which handles symlinks differently.
+TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
+ GPGSM=$(GPGSM) $(srcdir)/runtest
+
+testscripts = sm-sign+verify sm-verify
+EXTRA_DIST = runtest inittests $(testscripts) ChangeLog-2011 \
+ text-1.txt text-2.txt text-3.txt \
+ text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \
+ text-2.osig.pem text-2.osig-bad.pem \
+ samplekeys/steed-self-signing-nonthority.pem \
+ samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \
+ samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
+ samplekeys/cert_g10code_pete1.pem \
+ samplekeys/cert_g10code_test1.pem \
+ samplekeys/cert_g10code_theo1.pem
+
+CLEANFILES = inittests.stamp x y y z out err \
+ *.lock .\#lk*
+
+DISTCLEANFILES = pubring.kbx~ random_seed
+asschk_SOURCES = asschk.c
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu tests/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+asschk$(EXEEXT): $(asschk_OBJECTS) $(asschk_DEPENDENCIES) $(EXTRA_asschk_DEPENDENCIES)
+ @rm -f asschk$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(asschk_OBJECTS) $(asschk_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/asschk.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ col=$$blu; res=SKIP; \
+ fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
+ All=""; \
+ else \
+ tests="tests"; \
+ All="All "; \
+ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="$$All$$all $$tests passed"; \
+ else \
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all $$tests failed"; \
+ else \
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-recursive
+all-am: Makefile $(PROGRAMS) all-local
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-local clean-noinstPROGRAMS \
+ mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+ check check-TESTS check-am clean clean-generic clean-local \
+ clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
+
+
+all-local: inittests.stamp
+
+clean-local:
+ srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests --clean
+
+inittests.stamp: inittests
+ srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests
+ echo timestamp >./inittests.stamp
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc tests/openpgp/Makefile.in
index 42447b9,0000000..63d0e44
mode 100644,000000..100644
--- a/tests/openpgp/Makefile.in
+++ b/tests/openpgp/Makefile.in
@@@ -1,708 -1,0 +1,714 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Makefile.am - For tests/openpgp
+# Copyright (C) 1998, 1999, 2000, 2001, 2003,
+# 2010 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+# Process this file with automake to create Makefile.in
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
++TESTS = version.test mds.test decrypt.test decrypt-dsa.test sigs.test \
++ sigs-dsa.test encrypt.test encrypt-dsa.test seat.test \
++ clearsig.test encryptp.test detach.test armsigs.test \
++ armencrypt.test armencryptp.test signencrypt.test \
++ signencrypt-dsa.test armsignencrypt.test armdetach.test \
++ armdetachm.test detachm.test genkey1024.test conventional.test \
++ conventional-mdc.test multisig.test verify.test armor.test \
++ import.test ecc.test 4gb-packet.test $(am__EXEEXT_1) \
++ gpgtar.test use-exact-key.test finish.test
+subdir = tests/openpgp
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/build-aux/mkinstalldirs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
++ at SQLITE3_TRUE@am__EXEEXT_1 = tofu.test
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# Programs required before we can run these tests.
+required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \
+ ../../tools/gpg-connect-agent ../../tools/mk-tdata
+
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C
-
- # Note: version.test needs to be the first test to run and finish.test
- # the last one
- TESTS = version.test mds.test \
- decrypt.test decrypt-dsa.test \
- sigs.test sigs-dsa.test \
- encrypt.test encrypt-dsa.test \
- seat.test clearsig.test encryptp.test detach.test \
- armsigs.test armencrypt.test armencryptp.test \
- signencrypt.test signencrypt-dsa.test \
- armsignencrypt.test armdetach.test \
- armdetachm.test detachm.test genkey1024.test \
- conventional.test conventional-mdc.test \
- multisig.test verify.test armor.test \
- import.test ecc.test 4gb-packet.test finish.test
-
++ at SQLITE3_FALSE@sqlite3_dependent_tests =
++ at SQLITE3_TRUE@sqlite3_dependent_tests = tofu.test
+TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
+ plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
+ pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc \
+ gpg.conf.tmpl gpg-agent.conf.tmpl \
+ bug537-test.data.asc bug894-test.asc \
- bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc
++ bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \
++ tofu-keys.asc tofu-keys-secret.asc \
++ tofu-2183839A-1.txt tofu-BC15C85A-1.txt tofu-EE37CF96-1.txt
+
+data_files = data-500 data-9000 data-32000 data-80000 plain-large
+priv_keys = privkeys/50B2D4FA4122C212611048BC5FC31BD44393626E.asc \
+ privkeys/7E201E28B6FEB2927B321F443205F4724EBE637E.asc \
+ privkeys/13FDB8809B17C5547779F9D205C45F47CE0217CE.asc \
+ privkeys/343D8AF79796EE107D645A2787A9D9252F924E6F.asc \
+ privkeys/8B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34.asc \
+ privkeys/0D6F6AD4C4C803B25470F9104E9F4E6A4CA64255.asc \
+ privkeys/FD692BD59D6640A84C8422573D469F84F3B98E53.asc \
+ privkeys/76F7E2B35832976B50A27A282D9B87E44577EB66.asc \
+ privkeys/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD.asc \
+ privkeys/0DD40284FF992CD24DC4AAC367037E066FCEE26A.asc \
+ privkeys/2BC997C0B8691D41D29A4EC81CCBCF08454E4961.asc \
+ privkeys/3C9D5ECA70130C2DBB1FC6AC0076BEEEC197716F.asc \
+ privkeys/449E644892C951A37525654730DD32C202079926.asc \
+ privkeys/58FFE844087634E62440224908BDE44BEA7EB730.asc \
+ privkeys/4DF9172D6FF428C97A0E9AA96F03E8BCE3B2F188.asc \
+ privkeys/9D7CD8F53F2F14C3E2177D1E9D1D11F39513A4A4.asc \
+ privkeys/6E6B7ED0BD4425018FFC54F3921D5467A3AE00EB.asc \
+ privkeys/C905D0AB6AE9655C5A35975939997BBF3325D6DD.asc \
+ privkeys/B2BAA7144303DF19BB6FDE23781DD3FDD97918D4.asc \
+ privkeys/CF60965BF51F67CF80DECE853E0D2D343468571D.asc \
- privkeys/DF00E361D34F80868D06879AC21D7A7D4E4FAD76.asc
++ privkeys/DF00E361D34F80868D06879AC21D7A7D4E4FAD76.asc \
++ privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc \
++ privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc \
++ privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc \
++ privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc \
++ privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc
+
+sample_keys = samplekeys/ecc-sample-1-pub.asc \
+ samplekeys/ecc-sample-2-pub.asc \
+ samplekeys/ecc-sample-3-pub.asc \
+ samplekeys/ecc-sample-1-sec.asc \
+ samplekeys/ecc-sample-2-sec.asc \
+ samplekeys/ecc-sample-3-sec.asc \
+ samplekeys/eddsa-sample-1-pub.asc \
+ samplekeys/eddsa-sample-1-sec.asc \
+ samplekeys/dda252ebb8ebe1af-1.asc \
+ samplekeys/dda252ebb8ebe1af-2.asc \
+ samplekeys/whats-new-in-2.1.asc \
+ samplekeys/e2e-p256-1-clr.asc \
- samplekeys/e2e-p256-1-prt.asc
++ samplekeys/e2e-p256-1-prt.asc \
++ samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc
+
+EXTRA_DIST = defs.inc pinentry.sh $(TESTS) $(TEST_FILES) ChangeLog-2011 \
+ mkdemodirs signdemokey $(priv_keys) $(sample_keys)
+
+CLEANFILES = prepared.stamp x y yy z out err $(data_files) \
+ plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
+ *.test.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \
+ pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \
+ secring.gpg pubring.pkr secring.skr \
- gnupg-test.stop random_seed gpg-agent.log
++ gnupg-test.stop random_seed gpg-agent.log tofu.db
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/openpgp/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu tests/openpgp/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ col=$$blu; res=SKIP; \
+ fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
+ All=""; \
+ else \
+ tests="tests"; \
+ All="All "; \
+ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="$$All$$all $$tests passed"; \
+ else \
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all $$tests failed"; \
+ else \
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-local mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: all all-am all-local check check-TESTS check-am clean \
+ clean-generic clean-local cscopelist-am ctags-am distclean \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am
+
+
+clean-local:
- -rm -rf private-keys-v1.d openpgp-revocs.d
++ -rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d
+
+# We need to depend on a couple of programs so that the tests don't
+# start before all programs are built.
+all-local: $(required_pgms)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc tests/pkits/Makefile.in
index 542a56d,0000000..b25e320
mode 100644,000000..100644
--- a/tests/pkits/Makefile.in
+++ b/tests/pkits/Makefile.in
@@@ -1,671 -1,0 +1,673 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Makefile.am - tests using NIST's PKITS
+# Copyright (C) 2004, 2008 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = tests/pkits
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/build-aux/mkinstalldirs README
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+GPGSM = ../../sm/gpgsm
+TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
+ GPGSM=$(GPGSM) silent=yes
+
+testscripts = import-all-certs validate-all-certs \
+ signature-verification \
+ validity-periods \
+ verifying-name-chaining \
+ basic-certificate-revocation \
+ verifying-paths-self-issued \
+ verifying-basic-constraints \
+ key-usage \
+ certificate-policies \
+ require-explicit-policy \
+ policy-mappings \
+ inhibit-policy-mapping \
+ inhibit-any-policy \
+ name-constraints \
+ distribution-points \
+ delta-crls \
+ private-certificate-extensions
+
+EXTRA_DIST = inittests runtest common.sh $(testscripts) ChangeLog-2011 \
+ import-all-certs.data
+
+TESTS = $(testscripts)
+CLEANFILES = inittests.stamp scratch.*.tmp x y z out err *.lock .\#lk* *.log
+DISTCLEANFILES = pubring.kbx~ random_seed
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/pkits/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu tests/pkits/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ col=$$blu; res=SKIP; \
+ fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
+ All=""; \
+ else \
+ tests="tests"; \
+ All="All "; \
+ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="$$All$$all $$tests passed"; \
+ else \
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all $$tests failed"; \
+ else \
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-local mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: all all-am all-local check check-TESTS check-am clean \
+ clean-generic clean-local cscopelist-am ctags-am distclean \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am
+
+
+all-local: inittests.stamp
+
+clean-local:
+ srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests --clean
+
+inittests.stamp: inittests
+ srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests
+ echo timestamp >./inittests.stamp
+
+run-all-tests: inittests.stamp
+ @set -e; \
+ GNUPGHOME=`/bin/pwd`; export GNUPGHOME;\
+ unset GPG_AGENT_INFO; \
+ for tst in $(testscripts); do \
+ if ./$${tst}; then : ; \
+ elif test $$? -eq 77; then echo "- SKIP $$tst"; \
+ fi; \
+ done
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc tools/Makefile.in
index ff4a717,0000000..ab93ac3
mode 100644,000000..100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@@ -1,1199 -1,0 +1,1202 @@@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Makefile.am - Tools directory
+# Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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/>.
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(top_srcdir)/am/cmacros.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/build-aux/mkinstalldirs \
+ $(srcdir)/gpg-zip.in $(top_srcdir)/build-aux/depcomp
+ at HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+ at HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+ at GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+ at GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+ at GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+ at GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ at GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ at GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+ at HAVE_W32_SYSTEM_TRUE@am__append_8 = gpg-connect-agent-w32info.o
+bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
+ $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
+ at HAVE_W32_SYSTEM_FALSE@am__append_9 = watchgnupg gpgparsemail
+ at HAVE_W32CE_SYSTEM_FALSE@am__append_10 = gpgkey2ssh ${gpgtar}
+ at DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT)
+ at HAVE_W32CE_SYSTEM_FALSE@noinst_PROGRAMS = clean-sat$(EXEEXT) \
+ at HAVE_W32CE_SYSTEM_FALSE@ mk-tdata$(EXEEXT) \
+ at HAVE_W32CE_SYSTEM_FALSE@ make-dns-cert$(EXEEXT) \
+ at HAVE_W32CE_SYSTEM_FALSE@ gpgsplit$(EXEEXT)
+subdir = tools
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+ $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/m4/tar-ustar.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = gpg-zip
+CONFIG_CLEAN_VPATH_FILES =
+ at BUILD_SYMCRYPTRUN_TRUE@am__EXEEXT_1 = symcryptrun$(EXEEXT)
+ at HAVE_W32_SYSTEM_FALSE@am__EXEEXT_2 = watchgnupg$(EXEEXT) \
+ at HAVE_W32_SYSTEM_FALSE@ gpgparsemail$(EXEEXT)
+ at BUILD_GPGTAR_TRUE@am__EXEEXT_3 = gpgtar$(EXEEXT)
+ at HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 = gpgkey2ssh$(EXEEXT) \
+ at HAVE_W32CE_SYSTEM_FALSE@ $(am__EXEEXT_3)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
+ "$(DESTDIR)$(sbindir)"
+PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+clean_sat_SOURCES = clean-sat.c
+clean_sat_OBJECTS = clean-sat.$(OBJEXT)
+clean_sat_LDADD = $(LDADD)
+am__gpg_check_pattern_SOURCES_DIST = gpg-check-pattern.c
+ at DISABLE_REGEX_FALSE@am_gpg_check_pattern_OBJECTS = gpg_check_pattern-gpg-check-pattern.$(OBJEXT)
+gpg_check_pattern_OBJECTS = $(am_gpg_check_pattern_OBJECTS)
+am__DEPENDENCIES_1 =
+ at DISABLE_REGEX_FALSE@gpg_check_pattern_DEPENDENCIES = $(common_libs) \
+ at DISABLE_REGEX_FALSE@ $(am__DEPENDENCIES_1) \
+ at DISABLE_REGEX_FALSE@ $(am__DEPENDENCIES_1) \
+ at DISABLE_REGEX_FALSE@ $(am__DEPENDENCIES_1) \
+ at DISABLE_REGEX_FALSE@ $(am__DEPENDENCIES_1) \
+ at DISABLE_REGEX_FALSE@ $(am__DEPENDENCIES_1) \
+ at DISABLE_REGEX_FALSE@ $(am__DEPENDENCIES_1)
+gpg_check_pattern_LINK = $(CCLD) $(gpg_check_pattern_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_gpg_connect_agent_OBJECTS = gpg-connect-agent.$(OBJEXT) \
+ no-libgcrypt.$(OBJEXT)
+gpg_connect_agent_OBJECTS = $(am_gpg_connect_agent_OBJECTS)
+gpg_connect_agent_DEPENDENCIES = ../common/libgpgrl.a $(common_libs) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(resource_objs)
+am_gpgconf_OBJECTS = gpgconf.$(OBJEXT) gpgconf-comp.$(OBJEXT) \
+ no-libgcrypt.$(OBJEXT)
+gpgconf_OBJECTS = $(am_gpgconf_OBJECTS)
+ at HAVE_W32CE_SYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+gpgconf_DEPENDENCIES = $(maybe_commonpth_libs) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+gpgconf_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgconf_LDFLAGS) \
+ $(LDFLAGS) -o $@
+am__gpgkey2ssh_SOURCES_DIST = gpgkey2ssh.c
+ at HAVE_W32CE_SYSTEM_FALSE@am_gpgkey2ssh_OBJECTS = \
+ at HAVE_W32CE_SYSTEM_FALSE@ gpgkey2ssh-gpgkey2ssh.$(OBJEXT)
+gpgkey2ssh_OBJECTS = $(am_gpgkey2ssh_OBJECTS)
+ at HAVE_W32CE_SYSTEM_FALSE@gpgkey2ssh_DEPENDENCIES = $(common_libs) \
+ at HAVE_W32CE_SYSTEM_FALSE@ $(am__DEPENDENCIES_1) \
+ at HAVE_W32CE_SYSTEM_FALSE@ $(am__DEPENDENCIES_1) \
+ at HAVE_W32CE_SYSTEM_FALSE@ $(am__DEPENDENCIES_1) \
+ at HAVE_W32CE_SYSTEM_FALSE@ $(am__DEPENDENCIES_1) \
+ at HAVE_W32CE_SYSTEM_FALSE@ $(am__DEPENDENCIES_1)
+gpgkey2ssh_LINK = $(CCLD) $(gpgkey2ssh_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+am_gpgparsemail_OBJECTS = gpgparsemail.$(OBJEXT) rfc822parse.$(OBJEXT)
+gpgparsemail_OBJECTS = $(am_gpgparsemail_OBJECTS)
+gpgparsemail_DEPENDENCIES =
+gpgsplit_SOURCES = gpgsplit.c
+gpgsplit_OBJECTS = gpgsplit.$(OBJEXT)
+gpgsplit_DEPENDENCIES = $(common_libs) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+am_gpgtar_OBJECTS = gpgtar-gpgtar.$(OBJEXT) \
+ gpgtar-gpgtar-create.$(OBJEXT) gpgtar-gpgtar-extract.$(OBJEXT) \
+ gpgtar-gpgtar-list.$(OBJEXT) gpgtar-no-libgcrypt.$(OBJEXT)
+gpgtar_OBJECTS = $(am_gpgtar_OBJECTS)
- gpgtar_DEPENDENCIES = $(common_libs) $(am__DEPENDENCIES_1) \
++gpgtar_DEPENDENCIES = $(libcommonpth) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+gpgtar_LINK = $(CCLD) $(gpgtar_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+make_dns_cert_SOURCES = make-dns-cert.c
+make_dns_cert_OBJECTS = make-dns-cert.$(OBJEXT)
+make_dns_cert_LDADD = $(LDADD)
+mk_tdata_SOURCES = mk-tdata.c
+mk_tdata_OBJECTS = mk-tdata.$(OBJEXT)
+mk_tdata_LDADD = $(LDADD)
+am_symcryptrun_OBJECTS = symcryptrun.$(OBJEXT)
+symcryptrun_OBJECTS = $(am_symcryptrun_OBJECTS)
+ at HAVE_W32CE_SYSTEM_FALSE@am__DEPENDENCIES_3 = \
+ at HAVE_W32CE_SYSTEM_FALSE@ ../common/libsimple-pwquery.a
+symcryptrun_DEPENDENCIES = $(am__DEPENDENCIES_1) $(common_libs) \
+ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+am_watchgnupg_OBJECTS = watchgnupg.$(OBJEXT)
+watchgnupg_OBJECTS = $(am_watchgnupg_OBJECTS)
+watchgnupg_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+SCRIPTS = $(noinst_SCRIPTS) $(sbin_SCRIPTS)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = clean-sat.c $(gpg_check_pattern_SOURCES) \
+ $(gpg_connect_agent_SOURCES) $(gpgconf_SOURCES) \
+ $(gpgkey2ssh_SOURCES) $(gpgparsemail_SOURCES) gpgsplit.c \
+ $(gpgtar_SOURCES) make-dns-cert.c mk-tdata.c \
+ $(symcryptrun_SOURCES) $(watchgnupg_SOURCES)
+DIST_SOURCES = clean-sat.c $(am__gpg_check_pattern_SOURCES_DIST) \
+ $(gpg_connect_agent_SOURCES) $(gpgconf_SOURCES) \
+ $(am__gpgkey2ssh_SOURCES_DIST) $(gpgparsemail_SOURCES) \
+ gpgsplit.c $(gpgtar_SOURCES) make-dns-cert.c mk-tdata.c \
+ $(symcryptrun_SOURCES) $(watchgnupg_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
++SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
++SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = \
+ Manifest watchgnupg.c \
+ addgnupghome applygnupgdefaults \
+ lspgpot mail-signed-keys convert-from-106 sockprox.c \
+ ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
+
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
+ $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4) $(am__append_5) $(am__append_6) \
+ $(am__append_7)
+ at HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+ at HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+ at HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+ at HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs = $(am__append_8)
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
+sbin_SCRIPTS = addgnupghome applygnupgdefaults
+
+# bin_SCRIPTS += gpg-zip
+ at HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
+ at BUILD_SYMCRYPTRUN_FALSE@symcryptrun =
+ at BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
+ at BUILD_GPGTAR_FALSE@gpgtar =
+ at BUILD_GPGTAR_TRUE@gpgtar = gpgtar
+common_libs = $(libcommon)
+commonpth_libs = $(libcommonpth)
+ at HAVE_W32CE_SYSTEM_FALSE@maybe_commonpth_libs = $(common_libs)
+
+# Some modules require PTH under W32CE.
+ at HAVE_W32CE_SYSTEM_TRUE@maybe_commonpth_libs = $(commonpth_libs)
+ at HAVE_W32CE_SYSTEM_FALSE@pwquery_libs = ../common/libsimple-pwquery.a
+ at HAVE_W32CE_SYSTEM_TRUE@pwquery_libs =
+ at HAVE_W32CE_SYSTEM_TRUE@opt_libassuan_libs = $(LIBASSUAN_LIBS)
+gpgsplit_LDADD = $(common_libs) \
+ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+ $(ZLIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
+
+gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
+
+# common sucks in gpg-error, will they, nil they (some compilers
+# do not eliminate the supposed-to-be-unused-inline-functions).
+gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
+ $(LIBINTL) $(GPG_ERROR_LIBS) $(NETLIBS) \
+ $(LIBICONV) $(W32SOCKLIBS)
+
+gpgconf_LDFLAGS = $(extra_bin_ldflags)
+gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
+gpgparsemail_LDADD =
+symcryptrun_SOURCES = symcryptrun.c
+symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
+ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
+ $(LIBICONV) $(NETLIBS) $(W32SOCKLIBS)
+
+watchgnupg_SOURCES = watchgnupg.c
+watchgnupg_LDADD = $(NETLIBS)
+gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
+# FIXME: remove PTH_LIBS (why do we need them at all?)
+gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \
+ $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
+ $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
+ $(resource_objs)
+
+ at HAVE_W32CE_SYSTEM_FALSE@gpgkey2ssh_SOURCES = gpgkey2ssh.c
+ at HAVE_W32CE_SYSTEM_FALSE@gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
+# common via use of BUG() in an inline function, which
+# some compilers do not eliminate.
+ at HAVE_W32CE_SYSTEM_FALSE@gpgkey2ssh_LDADD = $(common_libs) \
+ at HAVE_W32CE_SYSTEM_FALSE@ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
+ at HAVE_W32CE_SYSTEM_FALSE@ $(NETLIBS)
+
+ at DISABLE_REGEX_FALSE@gpg_check_pattern_SOURCES = gpg-check-pattern.c
+ at DISABLE_REGEX_FALSE@gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
+ at DISABLE_REGEX_FALSE@gpg_check_pattern_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+ at DISABLE_REGEX_FALSE@ $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
+
+gpgtar_SOURCES = \
+ gpgtar.c gpgtar.h \
+ gpgtar-create.c \
+ gpgtar-extract.c \
+ gpgtar-list.c \
+ no-libgcrypt.c
+
- gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)
- #gpgtar_LDADD = $(commonpth_libs) $(PTH_LIBS) $(GPG_ERROR_LIBS)
- gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
++gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) $(NPTH_CFLAGS) $(LIBASSUAN_CFLAGS)
++gpgtar_LDADD = $(libcommonpth) $(GPG_ERROR_LIBS) \
++ $(NPTH_LIBS) $(LIBASSUAN_LIBS) \
+ $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu tools/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_srcdir)/am/cmacros.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+gpg-zip: $(top_builddir)/config.status $(srcdir)/gpg-zip.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-libexecPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+
+clean-libexecPROGRAMS:
+ -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+
+clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+clean-sat$(EXEEXT): $(clean_sat_OBJECTS) $(clean_sat_DEPENDENCIES) $(EXTRA_clean_sat_DEPENDENCIES)
+ @rm -f clean-sat$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(clean_sat_OBJECTS) $(clean_sat_LDADD) $(LIBS)
+
+gpg-check-pattern$(EXEEXT): $(gpg_check_pattern_OBJECTS) $(gpg_check_pattern_DEPENDENCIES) $(EXTRA_gpg_check_pattern_DEPENDENCIES)
+ @rm -f gpg-check-pattern$(EXEEXT)
+ $(AM_V_CCLD)$(gpg_check_pattern_LINK) $(gpg_check_pattern_OBJECTS) $(gpg_check_pattern_LDADD) $(LIBS)
+
+gpg-connect-agent$(EXEEXT): $(gpg_connect_agent_OBJECTS) $(gpg_connect_agent_DEPENDENCIES) $(EXTRA_gpg_connect_agent_DEPENDENCIES)
+ @rm -f gpg-connect-agent$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gpg_connect_agent_OBJECTS) $(gpg_connect_agent_LDADD) $(LIBS)
+
+gpgconf$(EXEEXT): $(gpgconf_OBJECTS) $(gpgconf_DEPENDENCIES) $(EXTRA_gpgconf_DEPENDENCIES)
+ @rm -f gpgconf$(EXEEXT)
+ $(AM_V_CCLD)$(gpgconf_LINK) $(gpgconf_OBJECTS) $(gpgconf_LDADD) $(LIBS)
+
+gpgkey2ssh$(EXEEXT): $(gpgkey2ssh_OBJECTS) $(gpgkey2ssh_DEPENDENCIES) $(EXTRA_gpgkey2ssh_DEPENDENCIES)
+ @rm -f gpgkey2ssh$(EXEEXT)
+ $(AM_V_CCLD)$(gpgkey2ssh_LINK) $(gpgkey2ssh_OBJECTS) $(gpgkey2ssh_LDADD) $(LIBS)
+
+gpgparsemail$(EXEEXT): $(gpgparsemail_OBJECTS) $(gpgparsemail_DEPENDENCIES) $(EXTRA_gpgparsemail_DEPENDENCIES)
+ @rm -f gpgparsemail$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gpgparsemail_OBJECTS) $(gpgparsemail_LDADD) $(LIBS)
+
+gpgsplit$(EXEEXT): $(gpgsplit_OBJECTS) $(gpgsplit_DEPENDENCIES) $(EXTRA_gpgsplit_DEPENDENCIES)
+ @rm -f gpgsplit$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gpgsplit_OBJECTS) $(gpgsplit_LDADD) $(LIBS)
+
+gpgtar$(EXEEXT): $(gpgtar_OBJECTS) $(gpgtar_DEPENDENCIES) $(EXTRA_gpgtar_DEPENDENCIES)
+ @rm -f gpgtar$(EXEEXT)
+ $(AM_V_CCLD)$(gpgtar_LINK) $(gpgtar_OBJECTS) $(gpgtar_LDADD) $(LIBS)
+
+make-dns-cert$(EXEEXT): $(make_dns_cert_OBJECTS) $(make_dns_cert_DEPENDENCIES) $(EXTRA_make_dns_cert_DEPENDENCIES)
+ @rm -f make-dns-cert$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(make_dns_cert_OBJECTS) $(make_dns_cert_LDADD) $(LIBS)
+
+mk-tdata$(EXEEXT): $(mk_tdata_OBJECTS) $(mk_tdata_DEPENDENCIES) $(EXTRA_mk_tdata_DEPENDENCIES)
+ @rm -f mk-tdata$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mk_tdata_OBJECTS) $(mk_tdata_LDADD) $(LIBS)
+
+symcryptrun$(EXEEXT): $(symcryptrun_OBJECTS) $(symcryptrun_DEPENDENCIES) $(EXTRA_symcryptrun_DEPENDENCIES)
+ @rm -f symcryptrun$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(symcryptrun_OBJECTS) $(symcryptrun_LDADD) $(LIBS)
+
+watchgnupg$(EXEEXT): $(watchgnupg_OBJECTS) $(watchgnupg_DEPENDENCIES) $(EXTRA_watchgnupg_DEPENDENCIES)
+ @rm -f watchgnupg$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(watchgnupg_OBJECTS) $(watchgnupg_LDADD) $(LIBS)
+install-sbinSCRIPTS: $(sbin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-sbinSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clean-sat.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg-connect-agent.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgconf-comp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgconf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgkey2ssh-gpgkey2ssh.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgparsemail.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgsplit.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgtar-gpgtar-create.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgtar-gpgtar-extract.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgtar-gpgtar-list.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgtar-gpgtar.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpgtar-no-libgcrypt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/make-dns-cert.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mk-tdata.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/no-libgcrypt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rfc822parse.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/symcryptrun.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/watchgnupg.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+gpg_check_pattern-gpg-check-pattern.o: gpg-check-pattern.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_check_pattern_CFLAGS) $(CFLAGS) -MT gpg_check_pattern-gpg-check-pattern.o -MD -MP -MF $(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Tpo -c -o gpg_check_pattern-gpg-check-pattern.o `test -f 'gpg-check-pattern.c' || echo '$(srcdir)/'`gpg-check-pattern.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Tpo $(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpg-check-pattern.c' object='gpg_check_pattern-gpg-check-pattern.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_check_pattern_CFLAGS) $(CFLAGS) -c -o gpg_check_pattern-gpg-check-pattern.o `test -f 'gpg-check-pattern.c' || echo '$(srcdir)/'`gpg-check-pattern.c
+
+gpg_check_pattern-gpg-check-pattern.obj: gpg-check-pattern.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_check_pattern_CFLAGS) $(CFLAGS) -MT gpg_check_pattern-gpg-check-pattern.obj -MD -MP -MF $(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Tpo -c -o gpg_check_pattern-gpg-check-pattern.obj `if test -f 'gpg-check-pattern.c'; then $(CYGPATH_W) 'gpg-check-pattern.c'; else $(CYGPATH_W) '$(srcdir)/gpg-check-pattern.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Tpo $(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpg-check-pattern.c' object='gpg_check_pattern-gpg-check-pattern.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpg_check_pattern_CFLAGS) $(CFLAGS) -c -o gpg_check_pattern-gpg-check-pattern.obj `if test -f 'gpg-check-pattern.c'; then $(CYGPATH_W) 'gpg-check-pattern.c'; else $(CYGPATH_W) '$(srcdir)/gpg-check-pattern.c'; fi`
+
+gpgkey2ssh-gpgkey2ssh.o: gpgkey2ssh.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgkey2ssh_CFLAGS) $(CFLAGS) -MT gpgkey2ssh-gpgkey2ssh.o -MD -MP -MF $(DEPDIR)/gpgkey2ssh-gpgkey2ssh.Tpo -c -o gpgkey2ssh-gpgkey2ssh.o `test -f 'gpgkey2ssh.c' || echo '$(srcdir)/'`gpgkey2ssh.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgkey2ssh-gpgkey2ssh.Tpo $(DEPDIR)/gpgkey2ssh-gpgkey2ssh.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgkey2ssh.c' object='gpgkey2ssh-gpgkey2ssh.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgkey2ssh_CFLAGS) $(CFLAGS) -c -o gpgkey2ssh-gpgkey2ssh.o `test -f 'gpgkey2ssh.c' || echo '$(srcdir)/'`gpgkey2ssh.c
+
+gpgkey2ssh-gpgkey2ssh.obj: gpgkey2ssh.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgkey2ssh_CFLAGS) $(CFLAGS) -MT gpgkey2ssh-gpgkey2ssh.obj -MD -MP -MF $(DEPDIR)/gpgkey2ssh-gpgkey2ssh.Tpo -c -o gpgkey2ssh-gpgkey2ssh.obj `if test -f 'gpgkey2ssh.c'; then $(CYGPATH_W) 'gpgkey2ssh.c'; else $(CYGPATH_W) '$(srcdir)/gpgkey2ssh.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgkey2ssh-gpgkey2ssh.Tpo $(DEPDIR)/gpgkey2ssh-gpgkey2ssh.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgkey2ssh.c' object='gpgkey2ssh-gpgkey2ssh.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgkey2ssh_CFLAGS) $(CFLAGS) -c -o gpgkey2ssh-gpgkey2ssh.obj `if test -f 'gpgkey2ssh.c'; then $(CYGPATH_W) 'gpgkey2ssh.c'; else $(CYGPATH_W) '$(srcdir)/gpgkey2ssh.c'; fi`
+
+gpgtar-gpgtar.o: gpgtar.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-gpgtar.o -MD -MP -MF $(DEPDIR)/gpgtar-gpgtar.Tpo -c -o gpgtar-gpgtar.o `test -f 'gpgtar.c' || echo '$(srcdir)/'`gpgtar.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-gpgtar.Tpo $(DEPDIR)/gpgtar-gpgtar.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgtar.c' object='gpgtar-gpgtar.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-gpgtar.o `test -f 'gpgtar.c' || echo '$(srcdir)/'`gpgtar.c
+
+gpgtar-gpgtar.obj: gpgtar.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-gpgtar.obj -MD -MP -MF $(DEPDIR)/gpgtar-gpgtar.Tpo -c -o gpgtar-gpgtar.obj `if test -f 'gpgtar.c'; then $(CYGPATH_W) 'gpgtar.c'; else $(CYGPATH_W) '$(srcdir)/gpgtar.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-gpgtar.Tpo $(DEPDIR)/gpgtar-gpgtar.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgtar.c' object='gpgtar-gpgtar.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-gpgtar.obj `if test -f 'gpgtar.c'; then $(CYGPATH_W) 'gpgtar.c'; else $(CYGPATH_W) '$(srcdir)/gpgtar.c'; fi`
+
+gpgtar-gpgtar-create.o: gpgtar-create.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-gpgtar-create.o -MD -MP -MF $(DEPDIR)/gpgtar-gpgtar-create.Tpo -c -o gpgtar-gpgtar-create.o `test -f 'gpgtar-create.c' || echo '$(srcdir)/'`gpgtar-create.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-gpgtar-create.Tpo $(DEPDIR)/gpgtar-gpgtar-create.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgtar-create.c' object='gpgtar-gpgtar-create.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-gpgtar-create.o `test -f 'gpgtar-create.c' || echo '$(srcdir)/'`gpgtar-create.c
+
+gpgtar-gpgtar-create.obj: gpgtar-create.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-gpgtar-create.obj -MD -MP -MF $(DEPDIR)/gpgtar-gpgtar-create.Tpo -c -o gpgtar-gpgtar-create.obj `if test -f 'gpgtar-create.c'; then $(CYGPATH_W) 'gpgtar-create.c'; else $(CYGPATH_W) '$(srcdir)/gpgtar-create.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-gpgtar-create.Tpo $(DEPDIR)/gpgtar-gpgtar-create.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgtar-create.c' object='gpgtar-gpgtar-create.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-gpgtar-create.obj `if test -f 'gpgtar-create.c'; then $(CYGPATH_W) 'gpgtar-create.c'; else $(CYGPATH_W) '$(srcdir)/gpgtar-create.c'; fi`
+
+gpgtar-gpgtar-extract.o: gpgtar-extract.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-gpgtar-extract.o -MD -MP -MF $(DEPDIR)/gpgtar-gpgtar-extract.Tpo -c -o gpgtar-gpgtar-extract.o `test -f 'gpgtar-extract.c' || echo '$(srcdir)/'`gpgtar-extract.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-gpgtar-extract.Tpo $(DEPDIR)/gpgtar-gpgtar-extract.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgtar-extract.c' object='gpgtar-gpgtar-extract.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-gpgtar-extract.o `test -f 'gpgtar-extract.c' || echo '$(srcdir)/'`gpgtar-extract.c
+
+gpgtar-gpgtar-extract.obj: gpgtar-extract.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-gpgtar-extract.obj -MD -MP -MF $(DEPDIR)/gpgtar-gpgtar-extract.Tpo -c -o gpgtar-gpgtar-extract.obj `if test -f 'gpgtar-extract.c'; then $(CYGPATH_W) 'gpgtar-extract.c'; else $(CYGPATH_W) '$(srcdir)/gpgtar-extract.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-gpgtar-extract.Tpo $(DEPDIR)/gpgtar-gpgtar-extract.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgtar-extract.c' object='gpgtar-gpgtar-extract.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-gpgtar-extract.obj `if test -f 'gpgtar-extract.c'; then $(CYGPATH_W) 'gpgtar-extract.c'; else $(CYGPATH_W) '$(srcdir)/gpgtar-extract.c'; fi`
+
+gpgtar-gpgtar-list.o: gpgtar-list.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-gpgtar-list.o -MD -MP -MF $(DEPDIR)/gpgtar-gpgtar-list.Tpo -c -o gpgtar-gpgtar-list.o `test -f 'gpgtar-list.c' || echo '$(srcdir)/'`gpgtar-list.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-gpgtar-list.Tpo $(DEPDIR)/gpgtar-gpgtar-list.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgtar-list.c' object='gpgtar-gpgtar-list.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-gpgtar-list.o `test -f 'gpgtar-list.c' || echo '$(srcdir)/'`gpgtar-list.c
+
+gpgtar-gpgtar-list.obj: gpgtar-list.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-gpgtar-list.obj -MD -MP -MF $(DEPDIR)/gpgtar-gpgtar-list.Tpo -c -o gpgtar-gpgtar-list.obj `if test -f 'gpgtar-list.c'; then $(CYGPATH_W) 'gpgtar-list.c'; else $(CYGPATH_W) '$(srcdir)/gpgtar-list.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-gpgtar-list.Tpo $(DEPDIR)/gpgtar-gpgtar-list.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gpgtar-list.c' object='gpgtar-gpgtar-list.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-gpgtar-list.obj `if test -f 'gpgtar-list.c'; then $(CYGPATH_W) 'gpgtar-list.c'; else $(CYGPATH_W) '$(srcdir)/gpgtar-list.c'; fi`
+
+gpgtar-no-libgcrypt.o: no-libgcrypt.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-no-libgcrypt.o -MD -MP -MF $(DEPDIR)/gpgtar-no-libgcrypt.Tpo -c -o gpgtar-no-libgcrypt.o `test -f 'no-libgcrypt.c' || echo '$(srcdir)/'`no-libgcrypt.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-no-libgcrypt.Tpo $(DEPDIR)/gpgtar-no-libgcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='no-libgcrypt.c' object='gpgtar-no-libgcrypt.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-no-libgcrypt.o `test -f 'no-libgcrypt.c' || echo '$(srcdir)/'`no-libgcrypt.c
+
+gpgtar-no-libgcrypt.obj: no-libgcrypt.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -MT gpgtar-no-libgcrypt.obj -MD -MP -MF $(DEPDIR)/gpgtar-no-libgcrypt.Tpo -c -o gpgtar-no-libgcrypt.obj `if test -f 'no-libgcrypt.c'; then $(CYGPATH_W) 'no-libgcrypt.c'; else $(CYGPATH_W) '$(srcdir)/no-libgcrypt.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gpgtar-no-libgcrypt.Tpo $(DEPDIR)/gpgtar-no-libgcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='no-libgcrypt.c' object='gpgtar-no-libgcrypt.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpgtar_CFLAGS) $(CFLAGS) -c -o gpgtar-no-libgcrypt.obj `if test -f 'no-libgcrypt.c'; then $(CYGPATH_W) 'no-libgcrypt.c'; else $(CYGPATH_W) '$(srcdir)/no-libgcrypt.c'; fi`
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
+ install-sbinSCRIPTS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
+ uninstall-sbinSCRIPTS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-sbinSCRIPTS install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
+ uninstall-sbinSCRIPTS
+
+
+ at HAVE_W32_SYSTEM_TRUE@.rc.o:
+ at HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+# Make sure that all libs are build before we use them. This is
+# important for things like make -j2.
+$(PROGRAMS): $(common_libs) $(pwquery_libs) ../common/libgpgrl.a
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--
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